[ACA-4649] release workflow fixes (#3041)

* release workflow fixes

* fix release triggering on push to master

* cleanup
This commit is contained in:
Denys Vuika 2023-03-07 06:06:34 -05:00 committed by GitHub
parent 483af3165c
commit b67a73d832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions

View File

@ -30,11 +30,11 @@ runs:
shell: bash shell: bash
run: | run: |
if [[ "${{ inputs.branch_name }}" == "master" ]]; then if [[ "${{ inputs.branch_name }}" == "master" ]]; then
TAG_VERSION=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') TAG_VERSION=$(jq -cr '.version' < package.json)
else else
TAG_VERSION=${{ inputs.branch_name }}-${{ github.run_id }} TAG_VERSION=${{ inputs.branch_name }}-${{ github.run_id }}
fi fi
echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV
- name: Publish image - name: Publish image
shell: bash shell: bash
run: ./scripts/travis/deploy/publish.sh ${{ inputs.domain }} ${{ inputs.username }} ${{ inputs.password }} $TAG_VERSION ${{ inputs.branch_name }} ${{ inputs.dry-run }} run: ./scripts/travis/deploy/publish.sh "${{ inputs.domain }}" "$REPO_SLUG" "${{ inputs.username }}" "${{ inputs.password }}" "$TAG_VERSION" "${{ inputs.branch_name }}" "${{ inputs.dry-run }}"

View File

@ -15,6 +15,9 @@ on:
- master - master
- develop-patch* - develop-patch*
- master-patch* - master-patch*
push:
branches:
- master
env: env:
APP_CONFIG_ECM_HOST: ${{ secrets.PIPELINE_ENV_URL }} APP_CONFIG_ECM_HOST: ${{ secrets.PIPELINE_ENV_URL }}
@ -37,6 +40,7 @@ env:
APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: / APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: /
APP_CONFIG_OAUTH2_REDIRECT_LOGIN: / APP_CONFIG_OAUTH2_REDIRECT_LOGIN: /
APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI: "{protocol}//{hostname}{:port}/assets/silent-refresh.html" APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI: "{protocol}//{hostname}{:port}/assets/silent-refresh.html"
REPO_SLUG: "alfresco/alfresco-content-app"
jobs: jobs:
publish-docker-registry: publish-docker-registry:

View File

@ -1,11 +1,12 @@
#!/bin/bash -e #!/bin/bash -e
DOMAIN="$1" DOMAIN="$1"
USERNAME="$2" REPO_SLUG="$2"
PASSWORD="$3" USERNAME="$3"
TAG_VERSION="$4" PASSWORD="$4"
BRANCH_NAME="$5" TAG_VERSION="$5"
DRY_RUN="$6" BRANCH_NAME="$6"
DRY_RUN="$7"
npm ci && npm run build.release npm ci && npm run build.release