Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 2f5e311

Browse files
committed
fix: rename master => main
1 parent 904c295 commit 2f5e311

File tree

7 files changed

+42
-43
lines changed

7 files changed

+42
-43
lines changed

.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: ["master"]
16+
branches: ["main"]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: ["master"]
19+
branches: ["main"]
2020
schedule:
2121
- cron: "16 1 * * 5"
2222

.github/workflows/preproduction.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Preproduction
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags-ignore:
88
- v*
99

@@ -16,16 +16,16 @@ jobs:
1616
name: Build & Register application
1717
runs-on: ubuntu-latest
1818
steps:
19-
- name: Get commit sha
20-
run: |
19+
- name: Get commit sha
20+
run: |
2121
echo "GITHUB_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
22-
- name: Use autodevops build and register
23-
uses: SocialGouv/actions/autodevops-build-register@v1
24-
with:
25-
environment: preprod
26-
imagePackage: app
27-
token: ${{ secrets.GITHUB_TOKEN }}
28-
dockerbuildargs: |
22+
- name: Use autodevops build and register
23+
uses: SocialGouv/actions/autodevops-build-register@v1
24+
with:
25+
environment: preprod
26+
imagePackage: app
27+
token: ${{ secrets.GITHUB_TOKEN }}
28+
dockerbuildargs: |
2929
GITHUB_SHA=${{ env.GITHUB_SHA }}
3030
3131
deploy:
@@ -36,11 +36,11 @@ jobs:
3636
name: preproduction
3737
url: https://template-preprod.dev.fabrique.social.gouv.fr
3838
steps:
39-
- name: Use kube-workflow deployment
40-
uses: SocialGouv/kube-workflow@v1
41-
with:
42-
environment: preprod
43-
token: ${{ secrets.GITHUB_TOKEN }}
44-
kubeconfig: ${{ secrets.KUBECONFIG }}
45-
rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
46-
rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
39+
- name: Use kube-workflow deployment
40+
uses: SocialGouv/kube-workflow@v1
41+
with:
42+
environment: preprod
43+
token: ${{ secrets.GITHUB_TOKEN }}
44+
kubeconfig: ${{ secrets.KUBECONFIG }}
45+
rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
46+
rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [master, alpha, beta, next]
6+
branches: [main, alpha, beta, next]
77

88
jobs:
99
release:

.github/workflows/review.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Review
33
on:
44
push:
55
branches-ignore:
6-
- master
6+
- main
77
tags-ignore:
88
- v*
99

@@ -16,29 +16,28 @@ jobs:
1616
name: Build & Register application
1717
runs-on: ubuntu-latest
1818
steps:
19-
- name: Get commit sha
20-
run: |
19+
- name: Get commit sha
20+
run: |
2121
echo "GITHUB_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
22-
- name: Use autodevops build and register
23-
uses: SocialGouv/actions/autodevops-build-register@v1
24-
with:
25-
environment: dev
26-
imagePackage: app
27-
token: ${{ secrets.GITHUB_TOKEN }}
28-
dockerbuildargs: |
22+
- name: Use autodevops build and register
23+
uses: SocialGouv/actions/autodevops-build-register@v1
24+
with:
25+
environment: dev
26+
imagePackage: app
27+
token: ${{ secrets.GITHUB_TOKEN }}
28+
dockerbuildargs: |
2929
GITHUB_SHA=${{ env.GITHUB_SHA }}
3030
3131
deploy:
3232
name: Deploy review branch
3333
runs-on: ubuntu-latest
3434
needs: [register]
3535
steps:
36-
37-
- name: Use kube-workflow deployment
38-
uses: SocialGouv/kube-workflow@v1
39-
with:
40-
environment: dev
41-
token: ${{ secrets.GITHUB_TOKEN }}
42-
kubeconfig: ${{ secrets.KUBECONFIG }}
43-
rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
44-
rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
36+
- name: Use kube-workflow deployment
37+
uses: SocialGouv/kube-workflow@v1
38+
with:
39+
environment: dev
40+
token: ${{ secrets.GITHUB_TOKEN }}
41+
kubeconfig: ${{ secrets.KUBECONFIG }}
42+
rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
43+
rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}

.github/workflows/storybook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Storybook
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66

77
concurrency:
88
cancel-in-progress: true

src/components/footer/__tests__/bottom.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ describe("Footer - Bottom", () => {
77
render(
88
<Bottom
99
version={version}
10-
commitHash="master"
10+
commitHash="main"
1111
repositoryUrl="https://github.com/SocialGouv/template"
1212
links={[{ href: "/", title: "Yo" }]}
1313
/>

src/config/layout.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,5 @@ export const footerBottomSection: FooterBottomSectionProps = {
193193
],
194194
version: process.env.NEXT_PUBLIC_APP_VERSION ?? "X.X.X",
195195
repositoryUrl: process.env.NEXT_PUBLIC_APP_REPOSITORY_URL ?? "",
196-
commitHash: process.env.NEXT_PUBLIC_APP_VERSION_COMMIT ?? "master",
196+
commitHash: process.env.NEXT_PUBLIC_APP_VERSION_COMMIT ?? "main",
197197
};

0 commit comments

Comments
 (0)