diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d3be1d21..507a1afe 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: ["master"] + branches: ["main"] pull_request: # The branches below must be a subset of the branches above - branches: ["master"] + branches: ["main"] schedule: - cron: "16 1 * * 5" diff --git a/.github/workflows/preproduction.yml b/.github/workflows/preproduction.yml index 964bfad8..d5fca9f5 100644 --- a/.github/workflows/preproduction.yml +++ b/.github/workflows/preproduction.yml @@ -3,7 +3,7 @@ name: Preproduction on: push: branches: - - master + - main tags-ignore: - v* @@ -16,16 +16,16 @@ jobs: name: Build & Register application runs-on: ubuntu-latest steps: - - name: Get commit sha - run: | + - name: Get commit sha + run: | echo "GITHUB_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - - name: Use autodevops build and register - uses: SocialGouv/actions/autodevops-build-register@v1 - with: - environment: preprod - imagePackage: app - token: ${{ secrets.GITHUB_TOKEN }} - dockerbuildargs: | + - name: Use autodevops build and register + uses: SocialGouv/actions/autodevops-build-register@v1 + with: + environment: preprod + imagePackage: app + token: ${{ secrets.GITHUB_TOKEN }} + dockerbuildargs: | GITHUB_SHA=${{ env.GITHUB_SHA }} deploy: @@ -36,11 +36,11 @@ jobs: name: preproduction url: https://template-preprod.dev.fabrique.social.gouv.fr steps: - - name: Use kube-workflow deployment - uses: SocialGouv/kube-workflow@v1 - with: - environment: preprod - token: ${{ secrets.GITHUB_TOKEN }} - kubeconfig: ${{ secrets.KUBECONFIG }} - rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }} - rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }} + - name: Use kube-workflow deployment + uses: SocialGouv/kube-workflow@v1 + with: + environment: preprod + token: ${{ secrets.GITHUB_TOKEN }} + kubeconfig: ${{ secrets.KUBECONFIG }} + rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }} + rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa77fde3..7489a944 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: workflow_dispatch: push: - branches: [master, alpha, beta, next] + branches: [main, alpha, beta, next] jobs: release: diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 8bb505f0..6329b552 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -3,7 +3,7 @@ name: Review on: push: branches-ignore: - - master + - main tags-ignore: - v* @@ -16,16 +16,16 @@ jobs: name: Build & Register application runs-on: ubuntu-latest steps: - - name: Get commit sha - run: | + - name: Get commit sha + run: | echo "GITHUB_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - - name: Use autodevops build and register - uses: SocialGouv/actions/autodevops-build-register@v1 - with: - environment: dev - imagePackage: app - token: ${{ secrets.GITHUB_TOKEN }} - dockerbuildargs: | + - name: Use autodevops build and register + uses: SocialGouv/actions/autodevops-build-register@v1 + with: + environment: dev + imagePackage: app + token: ${{ secrets.GITHUB_TOKEN }} + dockerbuildargs: | GITHUB_SHA=${{ env.GITHUB_SHA }} deploy: @@ -33,12 +33,11 @@ jobs: runs-on: ubuntu-latest needs: [register] steps: - - - name: Use kube-workflow deployment - uses: SocialGouv/kube-workflow@v1 - with: - environment: dev - token: ${{ secrets.GITHUB_TOKEN }} - kubeconfig: ${{ secrets.KUBECONFIG }} - rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }} - rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }} + - name: Use kube-workflow deployment + uses: SocialGouv/kube-workflow@v1 + with: + environment: dev + token: ${{ secrets.GITHUB_TOKEN }} + kubeconfig: ${{ secrets.KUBECONFIG }} + rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }} + rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }} diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml index 2691eb64..554d1d80 100644 --- a/.github/workflows/storybook.yml +++ b/.github/workflows/storybook.yml @@ -2,7 +2,7 @@ name: Storybook on: push: - branches: [master] + branches: [main] concurrency: cancel-in-progress: true diff --git a/src/components/footer/__tests__/bottom.test.tsx b/src/components/footer/__tests__/bottom.test.tsx index 73c8baa2..a440cbac 100644 --- a/src/components/footer/__tests__/bottom.test.tsx +++ b/src/components/footer/__tests__/bottom.test.tsx @@ -7,7 +7,7 @@ describe("Footer - Bottom", () => { render( diff --git a/src/config/layout.ts b/src/config/layout.ts index a6dc34ef..61f495a1 100644 --- a/src/config/layout.ts +++ b/src/config/layout.ts @@ -193,5 +193,5 @@ export const footerBottomSection: FooterBottomSectionProps = { ], version: process.env.NEXT_PUBLIC_APP_VERSION ?? "X.X.X", repositoryUrl: process.env.NEXT_PUBLIC_APP_REPOSITORY_URL ?? "", - commitHash: process.env.NEXT_PUBLIC_APP_VERSION_COMMIT ?? "master", + commitHash: process.env.NEXT_PUBLIC_APP_VERSION_COMMIT ?? "main", };