diff --git a/.github/actions/git-tag/action.yml b/.github/actions/git-tag/action.yml index 99e001705..40bc29464 100644 --- a/.github/actions/git-tag/action.yml +++ b/.github/actions/git-tag/action.yml @@ -2,10 +2,6 @@ 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 @@ -31,7 +27,7 @@ runs: if [[ "${{ inputs.dry-run }}" != "true" ]]; then git tag -a ${VERSION} -m "${VERSION} [ci skip] " git remote rm origin - GITHUB_REPO=https://${{ inputs.github_token }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git + GITHUB_REPO=https://${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git git remote add origin $GITHUB_REPO git push origin --tags fi diff --git a/.github/actions/publish-libs/action.yml b/.github/actions/publish-libs/action.yml index a6161593d..00ce7318f 100644 --- a/.github/actions/publish-libs/action.yml +++ b/.github/actions/publish-libs/action.yml @@ -6,18 +6,6 @@ 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 @@ -67,12 +55,14 @@ 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: | @@ -103,14 +93,15 @@ runs: fi done env: - NODE_AUTH_TOKEN: ${{ inputs.github_token }} + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/setup-node@v3 name: setup NPM registry with: node-version-file: '.nvmrc' - registry-url: ${{ inputs.npm_registry_address }} + registry-url: 'https://${{ vars.NPM_REGISTRY_ADDRESS }}' scope: '@alfresco' - - name: publish tag to NPM registry + - name: Publish to NPM registry shell: bash run: | DIST_DIR="./dist/@alfresco" @@ -140,4 +131,4 @@ runs: fi done env: - NODE_AUTH_TOKEN: ${{ inputs.npm_registry_token }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35ed3d898..31e156077 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,6 +41,7 @@ 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: @@ -111,7 +112,6 @@ 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,8 +135,5 @@ 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 }}