From db15877fb44e4a1bc40be52c04cc13f502ada9b5 Mon Sep 17 00:00:00 2001 From: Amulya Kashyap Date: Fri, 2 Feb 2024 18:17:05 +0530 Subject: [PATCH 1/2] Added external workflow --- .../on-release-creation-publish-to-npm.yml | 15 +---------- .github/workflows/prerelease.yml | 27 +------------------ .../run-tests-on-pr-and-push-to-main.yml | 23 +--------------- 3 files changed, 3 insertions(+), 62 deletions(-) diff --git a/.github/workflows/on-release-creation-publish-to-npm.yml b/.github/workflows/on-release-creation-publish-to-npm.yml index 77a9eb2..9c9e6b2 100644 --- a/.github/workflows/on-release-creation-publish-to-npm.yml +++ b/.github/workflows/on-release-creation-publish-to-npm.yml @@ -6,17 +6,4 @@ on: jobs: build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.3.0 - # Setup .npmrc file to publish to npm - # See https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages - - uses: actions/setup-node@v3.6.0 - with: - node-version: 16 - registry-url: "https://registry.npmjs.org" - - run: npm install - - run: npm test - - run: npm publish --access public - env: - NODE_AUTH_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} + uses: adobe/aio-reusable-workflows/.github/workflows/on-release-creation-publish-to-npm.yml@main \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 417d605..7ab5c24 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -16,29 +16,4 @@ on: default: '@adobe/aio-cli-lib-app-config,@adobe/aio-cli-lib-console,@adobe/aio-lib-console-project-installation,@adobe/aio-lib-core-config,@adobe/aio-lib-core-logging,@adobe/aio-lib-env,@adobe/aio-lib-ims,@adobe/aio-lib-templates' jobs: checkout: - name: checkout - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: | - git config user.name github-actions - git config user.email github-actions@github.com - - uses: actions/setup-node@v1 - with: - node-version: 18 - - run: | - npm install - npm test - - name: Update your package.json with an npm pre-release version - id: pre-release-version - uses: adobe/update-prerelease-npm-version@v1.0.0 - with: - pre-release-tag: ${{ github.event.inputs.pre-release-tag }} - dependencies-to-update: ${{ github.event.inputs.dependencies-to-update }} - dependencies-to-update-version-tag: ${{ github.event.inputs.dist-tag }} - - run: echo pre-release-version - ${{ steps.pre-release-version.outputs.pre-release-version }} - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} - tag: ${{ github.event.inputs.dist-tag }} - access: 'public' + uses: adobe/aio-reusable-workflows/.github/workflows/prerelease.yml@main \ No newline at end of file diff --git a/.github/workflows/run-tests-on-pr-and-push-to-main.yml b/.github/workflows/run-tests-on-pr-and-push-to-main.yml index ddec6f0..0da3b31 100644 --- a/.github/workflows/run-tests-on-pr-and-push-to-main.yml +++ b/.github/workflows/run-tests-on-pr-and-push-to-main.yml @@ -11,25 +11,4 @@ on: jobs: build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [18.x, 20.x] - os: [ubuntu-latest, windows-latest] - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm i --package-lock --package-lock-only - - run: npm ci - - run: npm run build --if-present - - run: npm test - - name: upload coverage - if: success() - uses: codecov/codecov-action@v3.1.1 - with: - name: ${{ runner.os }} node.js ${{ matrix.node-version }} + uses: adobe/aio-reusable-workflows/.github/workflows/node.js.yml@main \ No newline at end of file From 275f42c43946c9ab34a7b19e992cc7e0252deb7b Mon Sep 17 00:00:00 2001 From: Amulya Kashyap Date: Thu, 8 Feb 2024 20:15:03 +0530 Subject: [PATCH 2/2] added secrets inherit --- .github/workflows/on-release-creation-publish-to-npm.yml | 3 ++- .github/workflows/prerelease.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-release-creation-publish-to-npm.yml b/.github/workflows/on-release-creation-publish-to-npm.yml index 9c9e6b2..6914e23 100644 --- a/.github/workflows/on-release-creation-publish-to-npm.yml +++ b/.github/workflows/on-release-creation-publish-to-npm.yml @@ -6,4 +6,5 @@ on: jobs: build: - uses: adobe/aio-reusable-workflows/.github/workflows/on-release-creation-publish-to-npm.yml@main \ No newline at end of file + uses: adobe/aio-reusable-workflows/.github/workflows/on-release-creation-publish-to-npm.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 7ab5c24..835e8c7 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -16,4 +16,5 @@ on: default: '@adobe/aio-cli-lib-app-config,@adobe/aio-cli-lib-console,@adobe/aio-lib-console-project-installation,@adobe/aio-lib-core-config,@adobe/aio-lib-core-logging,@adobe/aio-lib-env,@adobe/aio-lib-ims,@adobe/aio-lib-templates' jobs: checkout: - uses: adobe/aio-reusable-workflows/.github/workflows/prerelease.yml@main \ No newline at end of file + uses: adobe/aio-reusable-workflows/.github/workflows/prerelease.yml@main + secrets: inherit \ No newline at end of file