From 8e7daa52a0d5906f7279c73d48dee38b4423983c Mon Sep 17 00:00:00 2001 From: Amulya Kashyap Date: Fri, 2 Feb 2024 16:14:35 +0530 Subject: [PATCH 1/2] Added external workflows --- .github/workflows/daily.yml | 26 +------------------- .github/workflows/node.js.yml | 24 +----------------- .github/workflows/on-push-publish-to-npm.yml | 12 +-------- .github/workflows/prerelease.yml | 25 +------------------ .github/workflows/version-bump-publish.yml | 24 +----------------- 5 files changed, 5 insertions(+), 106 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 0c1fe67..9d8de01 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -7,28 +7,4 @@ on: jobs: build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [18] - os: [ubuntu-latest] - - steps: - - uses: actions/checkout@v2 - - 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 - - name: run unit tests - run: npm run test - - name: Slack Notification - if: ${{ failure() }} - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_TITLE: 'Node version' - SLACK_MESSAGE: ${{ matrix.node-version }} - SLACK_COLOR: ${{ job.status == 'success' && 'good' || job.status == 'cancelled' && '#808080' || 'danger' }} - + uses: adobe/aio-reusable-workflows/.github/workflows/daily.yml@main \ No newline at end of file diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 26b23ec..1d131a2 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -14,26 +14,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 diff --git a/.github/workflows/on-push-publish-to-npm.yml b/.github/workflows/on-push-publish-to-npm.yml index c926004..8d438d3 100644 --- a/.github/workflows/on-push-publish-to-npm.yml +++ b/.github/workflows/on-push-publish-to-npm.yml @@ -7,14 +7,4 @@ on: - "package.json" jobs: publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: 18 - - run: npm install - - run: npm test - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} + uses: adobe/aio-reusable-workflows/.github/workflows/on-push-publish-to-npm.yml@main \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 8f85ad7..a418b6d 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -13,27 +13,4 @@ on: 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.1.0 - with: - pre-release-tag: ${{ github.event.inputs.pre-release-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/version-bump-publish.yml b/.github/workflows/version-bump-publish.yml index 1c8c0bf..c266f0b 100644 --- a/.github/workflows/version-bump-publish.yml +++ b/.github/workflows/version-bump-publish.yml @@ -12,26 +12,4 @@ on: default: "latest" 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: bump and pub - if: ${{ github.event.inputs.level != '' }} - run: | - npm version ${{ github.event.inputs.level }} - git push - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} - tag: ${{ github.event.inputs.tag }} - access: "public" + uses: adobe/aio-reusable-workflows/.github/workflows/version-bump-publish.yml@main \ No newline at end of file From ffa901c793deacb486308142069e36b430eea990 Mon Sep 17 00:00:00 2001 From: Amulya Kashyap Date: Thu, 8 Feb 2024 19:28:43 +0530 Subject: [PATCH 2/2] added secrets inherit --- .github/workflows/daily.yml | 3 ++- .github/workflows/on-push-publish-to-npm.yml | 3 ++- .github/workflows/prerelease.yml | 3 ++- .github/workflows/version-bump-publish.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 9d8de01..5e8d4a8 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -7,4 +7,5 @@ on: jobs: build: - uses: adobe/aio-reusable-workflows/.github/workflows/daily.yml@main \ No newline at end of file + uses: adobe/aio-reusable-workflows/.github/workflows/daily.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/on-push-publish-to-npm.yml b/.github/workflows/on-push-publish-to-npm.yml index 8d438d3..4077621 100644 --- a/.github/workflows/on-push-publish-to-npm.yml +++ b/.github/workflows/on-push-publish-to-npm.yml @@ -7,4 +7,5 @@ on: - "package.json" jobs: publish: - uses: adobe/aio-reusable-workflows/.github/workflows/on-push-publish-to-npm.yml@main \ No newline at end of file + uses: adobe/aio-reusable-workflows/.github/workflows/on-push-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 a418b6d..8e0c1a7 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -13,4 +13,5 @@ on: 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 diff --git a/.github/workflows/version-bump-publish.yml b/.github/workflows/version-bump-publish.yml index c266f0b..f2893e9 100644 --- a/.github/workflows/version-bump-publish.yml +++ b/.github/workflows/version-bump-publish.yml @@ -12,4 +12,5 @@ on: default: "latest" jobs: checkout: - uses: adobe/aio-reusable-workflows/.github/workflows/version-bump-publish.yml@main \ No newline at end of file + uses: adobe/aio-reusable-workflows/.github/workflows/version-bump-publish.yml@main + secrets: inherit \ No newline at end of file