Skip to content

Commit

Permalink
fix: ACNA-1833 - integrating reusable-workflows (#616)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Goberling <Michael.Goberling@gmail.com>
Co-authored-by: Amulya Kashyap <amulyak@adobe.com>
Co-authored-by: Shazron Abdullah <36107+shazron@users.noreply.github.com>
  • Loading branch information
4 people committed Jan 12, 2024
1 parent 2e4115c commit 8133c82
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 131 deletions.
27 changes: 2 additions & 25 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,9 @@ name: Daily - Do npm install and run all unit tests
on:
schedule:
# run daily at midnight
- cron: '0 0 * * *'
- cron: "0 0 * * *"

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [18.x, 20.x]
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

28 changes: 3 additions & 25 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,10 @@ name: Node.js CI

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

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
4 changes: 3 additions & 1 deletion .github/workflows/on-push-publish-to-npm.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
name: on-push-publish-to-npm

on:
push:
branches:
- master # Change this if not your default branch
paths:
- 'package.json'
- "package.json"

jobs:
publish:
if: github.repository == 'adobe/aio-cli-plugin-app'
Expand Down
40 changes: 8 additions & 32 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,21 @@
name: publish-prerelease

on:
workflow_dispatch:
inputs:
pre-release-tag:
description: 'The pre-release tag use in the version'
description: "The pre-release tag use in the version"
required: false
default: 'pre'
default: "pre"
dist-tag:
description: 'The dist-tag use'
description: "The dist-tag use"
required: false
default: 'next'
default: "next"
dependencies-to-update:
description: 'csv of dependencies to update with the dist-tag'
description: "csv of dependencies to update with the dist-tag"
required: false
default: '@adobe/aio-cli-lib-app-config,@adobe/aio-cli-lib-console,@adobe/aio-lib-core-config,@adobe/aio-lib-core-logging,@adobe/aio-lib-core-networking,@adobe/aio-lib-env,@adobe/aio-lib-ims,@adobe/aio-lib-runtime,@adobe/aio-lib-web,@adobe/generator-aio-app'
default: "@adobe/aio-cli-lib-app-config,@adobe/aio-cli-lib-console,@adobe/aio-lib-core-config,@adobe/aio-lib-core-logging,@adobe/aio-lib-core-networking,@adobe/aio-lib-env,@adobe/aio-lib-ims,@adobe/aio-lib-runtime,@adobe/aio-lib-web,@adobe/generator-aio-app"

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
22 changes: 2 additions & 20 deletions .github/workflows/release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,8 @@ name: Release Branch CI

on:
pull_request:
branches: [ 'release-*', 'branch-prerelease' ]
branches: ["release-*", "branch-prerelease"]

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 run unit-tests
- run: npm run lint
uses: adobe/aio-reusable-workflows/.github/workflows/release-branch.yml@main
35 changes: 7 additions & 28 deletions .github/workflows/version-bump-publish.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,17 @@
name: version-bump-publish

on:
workflow_dispatch:
inputs:
level:
description: '<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease'
description: "<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease"
required: true
default: 'patch'
default: "patch"
tag:
description: 'The tag to publish to.'
description: "The tag to publish to."
required: false
default: 'latest'
default: "latest"

jobs:
checkout:
if: github.repository == 'adobe/aio-cli-plugin-app'
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

0 comments on commit 8133c82

Please sign in to comment.