chore: fixes

SocialGouv · Jul 13, 2023 · 4ff1532 · 4ff1532
1 parent e7ee579
commit 4ff1532
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 30 deletions.
diff --git a/.github/workflows/deactivate.yaml b/.github/workflows/deactivate.yaml
@@ -2,12 +2,22 @@ name: ♻️ Deactivate
 on:
   pull_request:
     types: [closed]
-
-concurrency:
-  cancel-in-progress: true
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}
+  delete:
+    branches:
+      - "**"
+      - "!v*"
+      - "!master"
+      - "!main"
+      - "!dev"
+      - "!develop"
+      - "!**/persist"
+      - "!persist/**"
+      - "!**/persist/**"
+      - "!persist-**"
+      - "!**-persist"
+      - "!**-persist-**"
 
 jobs:
-  kontinuous:
-    uses: socialgouv/workflows/.github/workflows/use-ks-wh-deactivate.yaml@v1
+  socialgouv:
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-deactivate.yaml@v1
     secrets: inherit
diff --git a/.github/workflows/preproduction.yaml b/.github/workflows/preproduction.yaml
@@ -13,7 +13,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}
 
 jobs:
-  kontinuous:
-    name: "Deploy on Kubernetes 🐳"
-    uses: socialgouv/workflows/.github/workflows/use-ks-wh-preproduction.yaml@v1
+  socialgouv:
+    name: "🇫🇷 SocialGouv"
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-preproduction.yaml@v1
     secrets: inherit
diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml
@@ -10,7 +10,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }}
 
 jobs:
-  kontinuous:
-    name: "Deploy on Kubernetes 🐳"
-    uses: socialgouv/workflows/.github/workflows/use-ks-wh-production.yaml@v1
+  socialgouv:
+    name: "🇫🇷 SocialGouv"
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-production.yaml@v1
     secrets: inherit
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,27 +3,15 @@ name: Release
 on:
   workflow_dispatch:
   push:
-    branches: [master, alpha, beta, next]
+    branches: [master, main, alpha, beta, next]
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: Semantic Release
-      uses: cycjimmy/semantic-release-action@v2
-      with:
-        semantic_version: 17
-        extra_plugins: |
-          @semantic-release/changelog@5.0.1
-          @semantic-release/git@9.0.0
-        extends: |
-          @socialgouv/releaserc
-      env:
-        GITHUB_TOKEN: ${{ secrets.SOCIALGROOVYBOT_BOTO_PAT }}
+      - uses: socialgouv/workflows/actions/semantic-release@v1
+        with:
+          github-token: ${{ secrets.SOCIALGROOVYBOT_BOTO_PAT }}
+          author-name: ${{ secrets.SOCIALGROOVYBOT_NAME }}
+          author-email: ${{ secrets.SOCIALGROOVYBOT_EMAIL }}