nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

Hotfix/release workflow (#1671)

Browse Source 
* fixing release workflow app service deploys

* adding the release branch as a conditional to the docker-stub build

* Add in missing 'if' statement for 'release' branch in Docker Stub step

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
This commit is contained in:
Joseph Flinn 2021-10-27 08:45:33 -07:00 committed by GitHub
parent 818b3b5d9d
commit 52d1bade06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,10 +371,12 @@ jobs:
run: dotnet tool restore run: dotnet tool restore
- name: Make Docker stub - name: Make Docker stub
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/release'
run: | run: |
if [[ "${{ github.ref }}" == "rc" ]]; then if [[ "${{ github.ref }}" == "rc" ]]; then
SETUP_IMAGE="bitwarden/setup:rc" SETUP_IMAGE="bitwarden/setup:rc"
elif [[ "${{ github.ref }}" == "release" ]]; then
SETUP_IMAGE="bitwarden/setup:latest"
else else
SETUP_IMAGE="bitwarden/setup:dev" SETUP_IMAGE="bitwarden/setup:dev"
fi fi
@ -389,7 +391,7 @@ jobs:
cd docker-stub; zip -r ../docker-stub.zip *; cd .. cd docker-stub; zip -r ../docker-stub.zip *; cd ..
- name: Upload Docker stub artifact - name: Upload Docker stub artifact
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/release'
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
with: with:
name: docker-stub.zip name: docker-stub.zip

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

@ -90,13 +90,21 @@ jobs:
--name appservices-${{ steps.setup.outputs.name_lower }}-webapp-name \ --name appservices-${{ steps.setup.outputs.name_lower }}-webapp-name \
--query value --output tsv --query value --output tsv
) )
publish_profile=$(
az keyvault secret show --vault-name $VAULT_NAME \
--name appservices-${{ steps.setup.outputs.name_lower }}-webapp-publish-profile \
--query value --output tsv
)
echo "::add-mask::$webapp_name" echo "::add-mask::$webapp_name"
echo "::set-output name=webapp-name::$webapp_name" echo "::set-output name=webapp-name::$webapp_name"
echo "::add-mask::$publish_profile"
echo "::set-output name=publish-profile::$publish_profile"
- name: Deploy App - name: Deploy App
uses: azure/webapps-deploy@798e43877120eda6a2a690a4f212c545e586ae31 uses: azure/webapps-deploy@798e43877120eda6a2a690a4f212c545e586ae31
with: with:
app-name: ${{ steps.retrieve-secrets.outputs.webapp-name }} app-name: ${{ steps.retrieve-secrets.outputs.webapp-name }}
publish-profile: ${{ steps.retrieve-secrets.outputs.publish-profile }}
package: ./${{ matrix.name }}.zip package: ./${{ matrix.name }}.zip
slot-name: "staging" slot-name: "staging"