From 89fcaa0469890433e09288fa0bfa7af2c60e386f Mon Sep 17 00:00:00 2001 From: Richard Helm Date: Mon, 4 Nov 2024 16:49:52 +0000 Subject: [PATCH] Revert changing version --- .github/workflows/deploy-showcase-dev-s3.yml | 12 ++++++++---- .github/workflows/deploy-showcase-pr-s3.yml | 12 ++++++++---- .github/workflows/post-merge-code-coverage.yml | 11 ++++++++--- .github/workflows/pull-request-master.yml | 11 +++++++---- .github/workflows/release-prepare.yml | 11 ++++++++--- .github/workflows/release.yml | 18 ++++++++++-------- 6 files changed, 49 insertions(+), 26 deletions(-) diff --git a/.github/workflows/deploy-showcase-dev-s3.yml b/.github/workflows/deploy-showcase-dev-s3.yml index 27cf3f7f24..519e8203e1 100644 --- a/.github/workflows/deploy-showcase-dev-s3.yml +++ b/.github/workflows/deploy-showcase-dev-s3.yml @@ -1,5 +1,9 @@ name: Build & Deploy Showcase (Dev) +permissions: + contents: read + packages: read + on: pull_request: types: [closed] @@ -13,18 +17,16 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_B }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_SECRET_B }} AWS_DEFAULT_REGION: eu-west-2 - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout uses: actions/checkout@v2 - name: Setup NodeJS 14 - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 14 - - - run: printf "registry=https://npm.pkg.github.com/Vonage\n_authToken=\${GITHUB_TOKEN}\n//npm.pkg.github.com/:_authToken=\${GITHUB_TOKEN}\nalways-auth=true" > .npmrc + registry-url: https://npm.pkg.github.com - name: Install yarn run: npm install -g yarn @@ -45,6 +47,8 @@ jobs: - name: Install dependencies if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn install --network-timeout 100000 + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Build storybook run: yarn storybook:build diff --git a/.github/workflows/deploy-showcase-pr-s3.yml b/.github/workflows/deploy-showcase-pr-s3.yml index 37a7a0d241..22415aad59 100644 --- a/.github/workflows/deploy-showcase-pr-s3.yml +++ b/.github/workflows/deploy-showcase-pr-s3.yml @@ -1,5 +1,9 @@ name: Build & Deploy Showcase (PR) +permissions: + contents: read + packages: read + on: pull_request: types: [opened, synchronize, reopened] @@ -11,7 +15,6 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_VIVID_DEMO_PRS_ACCESS }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_VIVID_DEMO_PRS_SECRET }} AWS_DEFAULT_REGION: us-east-1 - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Add PR deploy URL comment @@ -25,12 +28,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - run: printf "registry=https://npm.pkg.github.com/Vonage\n_authToken=\${GITHUB_TOKEN}\n//npm.pkg.github.com/:_authToken=\${GITHUB_TOKEN}\nalways-auth=true" > .npmrc - - name: Setup NodeJS 14 - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 14 + registry-url: https://npm.pkg.github.com - name: Install yarn run: npm install -g yarn @@ -51,6 +53,8 @@ jobs: - name: Install dependencies if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn install --network-timeout 100000 + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Build storybook run: yarn storybook:build base-url=${{ github.event.number }} diff --git a/.github/workflows/post-merge-code-coverage.yml b/.github/workflows/post-merge-code-coverage.yml index ab481f77be..961301de7f 100644 --- a/.github/workflows/post-merge-code-coverage.yml +++ b/.github/workflows/post-merge-code-coverage.yml @@ -1,5 +1,9 @@ name: Master Code Coverage +permissions: + contents: read + packages: read + on: push: branches: @@ -8,8 +12,6 @@ on: jobs: build-test-release: runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout @@ -19,9 +21,10 @@ jobs: ref: master - name: Setup NodeJS 14 - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 14 + registry-url: https://npm.pkg.github.com - run: printf "registry=https://npm.pkg.github.com/Vonage\n_authToken=\${GITHUB_TOKEN}\n//npm.pkg.github.com/:_authToken=\${GITHUB_TOKEN}\nalways-auth=true" > .npmrc @@ -44,6 +47,8 @@ jobs: - name: Install packages if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn install --network-timeout 100000 + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Build components run: yarn compile diff --git a/.github/workflows/pull-request-master.yml b/.github/workflows/pull-request-master.yml index c8ce3fac5b..229c8be2f8 100644 --- a/.github/workflows/pull-request-master.yml +++ b/.github/workflows/pull-request-master.yml @@ -1,5 +1,9 @@ name: Master Pull Request +permissions: + contents: read + packages: read + on: pull_request: types: @@ -21,14 +25,12 @@ jobs: if: github.event.pull_request.draft == false name: Build runs-on: ubuntu-20.04 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - - run: printf "registry=https://npm.pkg.github.com/Vonage\n//npm.pkg.github.com/:_authToken=\${GITHUB_TOKEN}\nalways-auth=true" > .npmrc - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: 14 + registry-url: https://npm.pkg.github.com - uses: actions/cache@v2 with: path: "**/node_modules" @@ -36,6 +38,7 @@ jobs: - run: yarn install --frozen-lockfile --network-timeout 100000 env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: yarn lerna run build --stream --concurrency=15 --include-dependencies - run: tar -zcf /tmp/vivid-env.tar.gz . - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml index 02b09942d9..5d8775ee79 100644 --- a/.github/workflows/release-prepare.yml +++ b/.github/workflows/release-prepare.yml @@ -1,5 +1,9 @@ name: Prepare Vivid for release +permissions: + contents: read + packages: read + on: workflow_dispatch: inputs: @@ -21,18 +25,19 @@ jobs: ref: master token: ${{ secrets.VNG_VVD_PAT }} - - run: printf "registry=https://npm.pkg.github.com/Vonage\n_authToken=\${GITHUB_TOKEN}\n//npm.pkg.github.com/:_authToken=\${GITHUB_TOKEN}\nalways-auth=true" > .npmrc - - name: Use Node.js 14 - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 14 + registry-url: https://npm.pkg.github.com - name: Install yarn run: npm install -g yarn - name: Install dependencies run: yarn install --network-timeout 100000 + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} # Update to a new version - name: Extract release version manually set diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6b2e63f71..5f1e72cbf8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,9 @@ name: Release +permissions: + contents: read + packages: read + concurrency: ${{ github.workflow }} on: @@ -10,22 +14,20 @@ on: jobs: build: runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.VNG_VVD_PAT }} steps: - name: Checkout uses: actions/checkout@v2 - name: Setup NodeJS 14 - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 14 - - - name: Writing .npmrc - run: printf "registry=https://npm.pkg.github.com/Vonage\n//npm.pkg.github.com/:_authToken=\${GITHUB_TOKEN}\nalways-auth=true" > .npmrc + registry-url: https://npm.pkg.github.com - name: Install dependencies run: yarn install --network-timeout 100000 + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: yarn compile - run: tar -zcf /tmp/vivid-env.tar.gz . @@ -76,7 +78,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_VIVID_DEMO_PROD_ACCESS }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_VIVID_DEMO_PROD_SECRET }} AWS_DEFAULT_REGION: us-east-1 - GITHUB_TOKEN: ${{ secrets.VNG_VVD_PAT }} + needs: publish runs-on: ubuntu-latest steps: @@ -85,7 +87,7 @@ jobs: with: fetch-depth: 0 - name: Setup NodeJS 14 - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 14 - uses: actions/download-artifact@v4