From e9b37f87a32dbe60dae965cf5364556383fcb718 Mon Sep 17 00:00:00 2001 From: gary-van-woerkens Date: Wed, 13 Oct 2021 11:21:46 +0200 Subject: [PATCH] fix: Update pipeline --- .github/workflows/production.yml | 8 +++++--- .github/workflows/review.yml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 7dde3c75..447faba8 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -6,7 +6,7 @@ on: - v* concurrency: - group: preproduction + group: production cancel-in-progress: true jobs: @@ -22,14 +22,14 @@ jobs: echo "project=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV - name: Application - uses: SocialGouv/actions/harbor-build-register@master + uses: SocialGouv/actions/autodevops-build-register@v1 with: imageName: ${{ env.project }}/app harborUsername: ${{ secrets.HARBOR_USERNAME }} harborPassword: ${{ secrets.HARBOR_PASSWORD }} - name: Hasura - uses: SocialGouv/actions/harbor-build-register@master + uses: SocialGouv/actions/autodevops-build-register@v1 with: imageName: ${{ env.project }}/hasura dockercontext: ./hasura @@ -81,12 +81,14 @@ jobs: name: production url: https://sample-next-app.fabrique.social.gouv.fr steps: + - name: Use k8s manifests generation uses: SocialGouv/actions/k8s-manifests@v1 with: environment: "prod" rancherId: ${{ secrets.RANCHER_PROJECT_ID }} socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }} + - name: Use autodevops deployment uses: SocialGouv/actions/autodevops-deploy@v1 with: diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 7c797aa5..482ce91e 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -25,14 +25,14 @@ jobs: echo "project=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV - name: Application - uses: SocialGouv/actions/harbor-build-register@master + uses: SocialGouv/actions/autodevops-build-register@v1 with: imageName: ${{ env.project }}/app harborUsername: ${{ secrets.HARBOR_USERNAME }} harborPassword: ${{ secrets.HARBOR_PASSWORD }} - name: Hasura - uses: SocialGouv/actions/harbor-build-register@master + uses: SocialGouv/actions/autodevops-build-register@v1 with: imageName: ${{ env.project }}/hasura dockercontext: ./hasura