Revert "[ACA-4649] fix token propagation"

This reverts commit d939caa5d9e9b6abf2010607e41c9a0ba932871f.
This commit is contained in:
Denys Vuika 2023-03-07 14:25:49 +00:00
parent d939caa5d9
commit c0e01fc6ab
3 changed files with 25 additions and 9 deletions

View File

@ -2,6 +2,10 @@ name: "Publish GitHub Tag"
description: "Publish GitHub Tag"
inputs:
github_token:
description: 'Github token'
required: true
type: string
branch_name:
description: 'Name of the branch the workflow runs on'
required: true
@ -27,7 +31,7 @@ runs:
if [[ "${{ inputs.dry-run }}" != "true" ]]; then
git tag -a ${VERSION} -m "${VERSION} [ci skip] "
git remote rm origin
GITHUB_REPO=https://${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git
GITHUB_REPO=https://${{ inputs.github_token }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git
git remote add origin $GITHUB_REPO
git push origin --tags
fi

View File

@ -6,6 +6,18 @@ inputs:
description: 'Name of the branch the workflow runs on'
required: true
type: string
github_token:
description: 'Github token'
required: true
type: string
npm_registry_address:
description: 'NPM registry address'
required: true
type: string
npm_registry_token:
description: 'NPM registry token'
required: true
type: string
npm_tag:
description: 'NPM tag'
required: true
@ -55,14 +67,12 @@ runs:
echo -e "\n\nBuild projects"
npm run build-libs
- uses: actions/setup-node@v3
name: setup GH registry
with:
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@alfresco'
- name: publish tag to GH registry
shell: bash
run: |
@ -93,15 +103,14 @@ runs:
fi
done
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ inputs.github_token }}
- uses: actions/setup-node@v3
name: setup NPM registry
with:
node-version-file: '.nvmrc'
registry-url: 'https://${{ vars.NPM_REGISTRY_ADDRESS }}'
registry-url: ${{ inputs.npm_registry_address }}
scope: '@alfresco'
- name: Publish to NPM registry
- name: publish tag to NPM registry
shell: bash
run: |
DIST_DIR="./dist/@alfresco"
@ -131,4 +140,4 @@ runs:
fi
done
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }}
NODE_AUTH_TOKEN: ${{ inputs.npm_registry_token }}

View File

@ -41,7 +41,6 @@ env:
APP_CONFIG_OAUTH2_REDIRECT_LOGIN: /
APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI: "{protocol}//{hostname}{:port}/assets/silent-refresh.html"
REPO_SLUG: "alfresco/alfresco-content-app"
NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }}
jobs:
publish-docker-registry:
@ -112,6 +111,7 @@ jobs:
- name: publish
uses: ./.github/actions/git-tag
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch_name: ${{ env.BRANCH_NAME }}
dry-run: ${{ inputs.dry-run-release }}
@ -135,5 +135,8 @@ jobs:
uses: ./.github/actions/publish-libs
with:
branch_name: ${{ env.BRANCH_NAME }}
github_token: ${{ secrets.GITHUB_TOKEN }}
npm_registry_address: ${{ vars.NPM_REGISTRY_ADDRESS }}
npm_registry_token: ${{ secrets.NPM_REGISTRY_TOKEN }}
npm_tag: ${{ env.TAG_NPM }}
dry-run: ${{ inputs.dry-run-release }}