Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change logo to support dynamic year #120

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
28 changes: 15 additions & 13 deletions .github/workflows/azure-deploy-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ on:
branches:
- 'main'
paths:
- 'Bouvet.Developer.Survey.Backend/**'

- 'Bouvet.Developer.Survey.Backend/**'
workflow_dispatch: # Allow manual trigger
inputs:
branch:
description: 'Branch to deploy'
required: true
default: 'main'

env:
DOTNET_VERSION: "8.0"
IMAGE_TAG: ${{ github.sha }}
Expand All @@ -25,15 +31,15 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Dotnet restore
working-directory: ./Bouvet.Developer.Survey.Backend
run: dotnet restore Bouvet.Developer.Survey.Backend.generated.sln

- name: Build with dotnet
working-directory: ./Bouvet.Developer.Survey.Backend
run: dotnet build Bouvet.Developer.Survey.Backend.generated.sln --configuration Release --no-restore

- name: Publish
working-directory: ./Bouvet.Developer.Survey.Backend
run: dotnet publish Bouvet.Developer.Survey.Backend.generated.sln --configuration Release --no-build
Expand Down Expand Up @@ -70,7 +76,7 @@ jobs:
runs-on: ubuntu-latest
name: Deploy/Quality Assurance
needs: test

defaults:
run:
working-directory: ./Bouvet.Developer.Survey.Backend
Expand Down Expand Up @@ -121,15 +127,15 @@ jobs:
resourceGroupName: ${{ secrets.AZURE_RG_TEST }}
template: infra/container-qa.bicep
parameters: acrServer=${{ env.LOGIN_SERVER }} acrUsername=${{ env.LOGIN_NAME }} acrPassword=${{ env.PASSWORD }} containerImage=${{ env.IMAGE_TAG }}
failOnStdErr: false
failOnStdErr: false

deploy-to-prod:
runs-on: ubuntu-latest
name: Deploy/Production
needs: [test, deploy-to-qa]
environment: Production
if: startsWith(github.ref, 'refs/tags/')

defaults:
run:
working-directory: ./Bouvet.Developer.Survey.Backend
Expand Down Expand Up @@ -181,7 +187,3 @@ jobs:
template: infra/container-prod.bicep
parameters: acrServer=${{ env.LOGIN_SERVER }} acrUsername=${{ env.LOGIN_NAME }} acrPassword=${{ env.PASSWORD }} containerImage=${{ env.IMAGE_TAG }}
failOnStdErr: false




16 changes: 8 additions & 8 deletions .github/workflows/pullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20
cache: "yarn"
cache: "npm"
cache-dependency-path: ${{github.workspace}}/frontend/package-lock.json
- run: yarn install --immutable
- run: npm ci

# Lint job
lint:
Expand All @@ -68,16 +68,16 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'yarn'
cache: 'npm'
cache-dependency-path: ${{github.workspace}}/frontend/package-lock.json

- name: Install packages
working-directory: ./frontend
run: yarn install
run: npm install

- name: Run lint
working-directory: ./frontend
run: yarn lint
run: npm run lint

# Tests
tests:
Expand All @@ -91,11 +91,11 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20
cache: "yarn"
cache: "npm"
cache-dependency-path: ${{github.workspace}}/frontend/package-lock.json
- name: Install packages
working-directory: ./frontend
run: yarn install
run: npm install
- name: Run tests
working-directory: ./frontend
run: yarn test
run: npm run test
2 changes: 1 addition & 1 deletion frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": ["next/core-web-vitals", "next/typescript"]
"extends": ["next/core-web-vitals", "next/typescript", "prettier"]
}
6 changes: 0 additions & 6 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ First, run the development server:

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000/home](http://localhost:3000/home) with your browser to see the result.
Expand Down
Loading