Update workflows for SCIM support (#2133)

(cherry picked from commit f736008)
bitwarden · Jul 27, 2022 · de99007 · de99007
1 parent 3595fd5
commit de99007
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -237,6 +237,7 @@ jobs:
             base_path: ./bitwarden_license/src
             docker_repos: [bitwarden, bitwardenqa.azurecr.io]
             dotnet: true
+            skip_dct: true
     steps:
       - name: Checkout repo
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
@@ -341,6 +342,7 @@ jobs:
           && (github.ref == 'refs/heads/master' ||
             github.ref == 'refs/heads/rc' ||
             github.ref == 'refs/heads/hotfix-rc')
+          && (!matrix.skip_dct)
         env:
           DCT_DELEGATION_KEY_ID: "c9bde8ec820701516491e5e03d3a6354e7bd66d05fa3df2b0062f68b116dc59c"
           DCT_DELEGATE_KEY: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-key }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -155,6 +155,7 @@ jobs:
           - service_name: Setup
           - service_name: Sso
           - service_name: Scim
+            skip_dct: true
     steps:
       - name: Print environment
         env:
@@ -185,6 +186,15 @@ jobs:
           azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
           azure-keyvault-name: "bitwarden-prod-kv"
 
+      - name: Check for DCT value
+        id: check-matrix-dct
+        run: |
+          if [[ "${{ matrix.skip_dct }}" == "true" ]]; then
+            echo "::set-output name=dct_enabled::0"
+          else
+            echo "::set-output name=dct_enabled::1"
+          fi
+
       - name: Pull latest selfhost image
         env:
           SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
@@ -208,7 +218,7 @@ jobs:
       - name: Push version and latest image
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         env:
-          DOCKER_CONTENT_TRUST: 1
+          DOCKER_CONTENT_TRUST: ${{ steps.check-matrix-dct.outputs.dct_enabled }}
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
           SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
         run: |