Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-24 12:35:25 +01:00
Code Issues Projects Releases Wiki Activity

Update workflows for SCIM support (#2133)

Browse Source
This commit is contained in:
Micaiah Martin 2022-07-21 14:36:40 +00:00 committed by GitHub
parent ac183363bd
commit f736008cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

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

12
.github/workflows/release.yml vendored
View File

@ -166,6 +166,7 @@ jobs:
- service_name: Setup - service_name: Setup
- service_name: Sso - service_name: Sso
- service_name: Scim - service_name: Scim
skip_dct: true
steps: steps:
- name: Print environment - name: Print environment
env: env:
@ -196,6 +197,15 @@ jobs:
azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
azure-keyvault-name: "bitwarden-prod-kv" 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 - name: Pull latest selfhost image
env: env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }} SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
@ -219,7 +229,7 @@ jobs:
- name: Push version and latest image - name: Push version and latest image
if: ${{ github.event.inputs.release_type != 'Dry Run' }} if: ${{ github.event.inputs.release_type != 'Dry Run' }}
env: 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 }} DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
SERVICE_NAME: ${{ steps.setup.outputs.service_name }} SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
run: | run: |