From 3cc90040d0f7c3d6f57095c505e28fa7979ecd06 Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Thu, 13 Jul 2023 09:49:13 +0200 Subject: [PATCH] Feat/ovh (#15) * fix: deploy on ovh * fix: use ci-sandbox * fix: use ovh only on dev/preprod * chore: trigger * fix: use ifEnv for extends ovh * chore: fixes --- .github/workflows/deactivate.yaml | 22 ++++++++++++++++------ .github/workflows/preproduction.yaml | 6 +++--- .github/workflows/production.yaml | 6 +++--- .github/workflows/release.yaml | 24 ++++++------------------ .github/workflows/review-auto.yaml | 5 +++-- .github/workflows/review.yaml | 7 ++++--- .kontinuous/config.yaml | 12 ++++++++---- .socialgouv.yaml | 0 8 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 .socialgouv.yaml diff --git a/.github/workflows/deactivate.yaml b/.github/workflows/deactivate.yaml index b7b8922..9f6e3e2 100644 --- 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 index 6a8beb5..c0028bf 100644 --- 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 index 14c6dc6..3cae2d5 100644 --- 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 index 1eeb2d7..1cae45b 100644 --- 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 }} diff --git a/.github/workflows/review-auto.yaml b/.github/workflows/review-auto.yaml index d096149..548cf4e 100644 --- a/.github/workflows/review-auto.yaml +++ b/.github/workflows/review-auto.yaml @@ -10,6 +10,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }} jobs: - kontinuous: - uses: socialgouv/workflows/.github/workflows/use-ks-wh-review-auto.yaml@v1 + socialgouv: + name: "🇫🇷 SocialGouv" + uses: socialgouv/workflows/.github/workflows/use-ks-gh-review-auto.yaml@v1 secrets: inherit diff --git a/.github/workflows/review.yaml b/.github/workflows/review.yaml index f0b8bc6..2f78e3e 100644 --- a/.github/workflows/review.yaml +++ b/.github/workflows/review.yaml @@ -13,6 +13,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.ref }} jobs: - kontinuous: - uses: socialgouv/workflows/.github/workflows/use-ks-wh-review.yaml@v1 - secrets: inherit + socialgouv: + name: "🇫🇷 SocialGouv" + uses: socialgouv/workflows/.github/workflows/use-ks-gh-review.yaml@v1 + secrets: inherit \ No newline at end of file diff --git a/.kontinuous/config.yaml b/.kontinuous/config.yaml index edb2e60..8e11826 100644 --- a/.kontinuous/config.yaml +++ b/.kontinuous/config.yaml @@ -1,8 +1,12 @@ projectName: sandbox +ciNamespace: ci-sandbox +kubeconfigContext: + dev: ovh-dev + preprod: ovh-dev + prod: azure dependencies: fabrique: - import: SocialGouv/kontinuous/plugins/fabrique - options: - registry: harbor.fabrique.social.gouv.fr - + extends: + - name: ovh + ifEnv: [dev,preprod] \ No newline at end of file diff --git a/.socialgouv.yaml b/.socialgouv.yaml new file mode 100644 index 0000000..e69de29