From 1370292ad90000f31becb017aba41c171581a14e Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Wed, 14 Dec 2022 15:11:36 +0100 Subject: [PATCH 1/5] Update workflows to use reusable-workflows --- .github/workflows/check-dist.yml | 42 +++------------------------ .github/workflows/codeql-analysis.yml | 15 ++++++++++ .github/workflows/licensed.yml | 21 +++----------- .github/workflows/workflow.yml | 34 ++++------------------ package.json | 1 + 5 files changed, 30 insertions(+), 83 deletions(-) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index 6274fd2..6d24c07 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -1,8 +1,3 @@ -# `dist/index.js` is a special file in Actions. -# When you reference an action with `uses:` in a workflow, -# `index.js` is the code that will run. -# For our project, we generate this file through a build process from other source files. -# We need to make sure the checked-in `index.js` actually matches what we expect it to be. name: Check dist/ on: @@ -17,36 +12,7 @@ on: workflow_dispatch: jobs: - check-dist: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Set Node.js 16.x - uses: actions/setup-node@v3 - with: - node-version: 16.x - cache: npm - - - name: Install dependencies - run: npm ci - - - name: Rebuild the dist/ directory - run: npm run build - - - name: Compare the expected and actual dist/ directories - run: | - if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then - echo "Detected uncommitted changes after build. See status below:" - git diff - exit 1 - fi - id: diff - - # If index.js was different than expected, upload the expected version as an artifact - - uses: actions/upload-artifact@v3 - if: ${{ failure() && steps.diff.conclusion == 'failure' }} - with: - name: dist - path: dist/ + call-check-dist: + name: Check dist/ + #uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main + uses: IvanZosimov/reusable-workflows/.github/workflows/check-dist.yml@main \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..6a9e685 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,15 @@ +name: CodeQL analysis + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + schedule: + - cron: '0 3 * * 0' + +jobs: + call-codeQL-analysis: + name: CodeQL analysis + #uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main + uses: IvanZosimov/reusable-workflows/.github/workflows/codeql-analysis.yml@main \ No newline at end of file diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index 3662014..ba82f63 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -9,20 +9,7 @@ on: - main jobs: - test: - runs-on: ubuntu-latest - name: Check licenses - steps: - - uses: actions/checkout@v3 - - name: Set Node.js 16.x - uses: actions/setup-node@v3 - with: - node-version: 16.x - - run: npm ci - - name: Install licensed - run: | - cd $RUNNER_TEMP - curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.4.4/licensed-3.4.4-linux-x64.tar.gz - sudo tar -xzf licensed.tar.gz - sudo mv licensed /usr/local/bin/licensed - - run: licensed status + call-licensed: + name: Licensed + #uses: actions/reusable-workflows/.github/workflows/licensed.yml@main + uses: IvanZosimov/reusable-workflows/.github/workflows/licensed.yml@main \ No newline at end of file diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index df67fa8..ccc70e1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,4 +1,5 @@ name: build-test + on: push: branches: @@ -8,32 +9,9 @@ on: pull_request: paths-ignore: - '**.md' + jobs: - run: - name: Run - runs-on: ${{ matrix.operating-system }} - strategy: - matrix: - operating-system: [ubuntu-latest, windows-latest] - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup node 16 - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: npm - - - name: npm ci - run: npm ci - - - name: Lint - run: npm run format-check - - - name: npm test - run: npm test - - - name: audit packages - run: npm audit --audit-level=high - if: matrix.operating-system == 'ubuntu-latest' + call-basic-validation: + name: Basic validation + #uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main + uses: IvanZosimov/reusable-workflows/.github/workflows/basic-validation.yml@main diff --git a/package.json b/package.json index a12677c..55f38b4 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "build": "tsc && ncc build -o dist/setup src/setup-go.ts && ncc build -o dist/cache-save src/cache-save.ts", "format": "prettier --write **/*.ts", "format-check": "prettier --check **/*.ts", + "lint": "", "test": "jest --coverage", "pre-checkin": "npm run format && npm run build && npm test" }, From 59e7baba60798c6092fb4524c836cd31d9b324af Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Thu, 15 Dec 2022 16:12:57 +0100 Subject: [PATCH 2/5] Update workflows --- .github/workflows/release-new-action-version.yml | 1 + .github/workflows/versions.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-new-action-version.yml b/.github/workflows/release-new-action-version.yml index e3e12f8..fcae53b 100644 --- a/.github/workflows/release-new-action-version.yml +++ b/.github/workflows/release-new-action-version.yml @@ -1,4 +1,5 @@ name: Release new action version + on: release: types: [released] diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index 95d1b6a..c31277b 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -1,4 +1,5 @@ name: Validate 'setup-go' + on: push: branches: From e417811a6d16112e2d151ef824843ebde54a698f Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Thu, 15 Dec 2022 16:31:23 +0100 Subject: [PATCH 3/5] Add links to reusable workflows --- .github/workflows/check-dist.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/licensed.yml | 2 +- .github/workflows/workflow.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index 6d24c07..9d9d3cc 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: jobs: - call-check-dist: + call-check-dist: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/check-dist.yml name: Check dist/ #uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main uses: IvanZosimov/reusable-workflows/.github/workflows/check-dist.yml@main \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6a9e685..16f258e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,7 +9,7 @@ on: - cron: '0 3 * * 0' jobs: - call-codeQL-analysis: + call-codeQL-analysis: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/codeql-analysis.yml name: CodeQL analysis #uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main uses: IvanZosimov/reusable-workflows/.github/workflows/codeql-analysis.yml@main \ No newline at end of file diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index ba82f63..ba322a6 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -9,7 +9,7 @@ on: - main jobs: - call-licensed: + call-licensed: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/licensed.yml name: Licensed #uses: actions/reusable-workflows/.github/workflows/licensed.yml@main uses: IvanZosimov/reusable-workflows/.github/workflows/licensed.yml@main \ No newline at end of file diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ccc70e1..64c4c41 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -11,7 +11,7 @@ on: - '**.md' jobs: - call-basic-validation: + call-basic-validation: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/basic-validation.yml name: Basic validation #uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main uses: IvanZosimov/reusable-workflows/.github/workflows/basic-validation.yml@main From e01c74b6905786c2b39126e5884038ded17c9ab3 Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Mon, 19 Dec 2022 13:22:55 +0100 Subject: [PATCH 4/5] Update action to use reusabl-workflows repo --- .github/workflows/check-dist.yml | 3 +-- .github/workflows/codeql-analysis.yml | 3 +-- .github/workflows/licensed.yml | 3 +-- .github/workflows/workflow.yml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index 9d9d3cc..d51766a 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -14,5 +14,4 @@ on: jobs: call-check-dist: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/check-dist.yml name: Check dist/ - #uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main - uses: IvanZosimov/reusable-workflows/.github/workflows/check-dist.yml@main \ No newline at end of file + uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 16f258e..fd4d859 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -11,5 +11,4 @@ on: jobs: call-codeQL-analysis: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/codeql-analysis.yml name: CodeQL analysis - #uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main - uses: IvanZosimov/reusable-workflows/.github/workflows/codeql-analysis.yml@main \ No newline at end of file + uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main \ No newline at end of file diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index ba322a6..ba7cd05 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -11,5 +11,4 @@ on: jobs: call-licensed: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/licensed.yml name: Licensed - #uses: actions/reusable-workflows/.github/workflows/licensed.yml@main - uses: IvanZosimov/reusable-workflows/.github/workflows/licensed.yml@main \ No newline at end of file + uses: actions/reusable-workflows/.github/workflows/licensed.yml@main \ No newline at end of file diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 64c4c41..46697e9 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -13,5 +13,4 @@ on: jobs: call-basic-validation: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/basic-validation.yml name: Basic validation - #uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main - uses: IvanZosimov/reusable-workflows/.github/workflows/basic-validation.yml@main + uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main \ No newline at end of file From 9acc3d3da9bcfb4869eacf7aca14b585d1dde32b Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Tue, 20 Dec 2022 16:34:43 +0100 Subject: [PATCH 5/5] Fix review points --- .github/workflows/{workflow.yml => basic-validation.yml} | 4 ++-- .github/workflows/check-dist.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/licensed.yml | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{workflow.yml => basic-validation.yml} (53%) diff --git a/.github/workflows/workflow.yml b/.github/workflows/basic-validation.yml similarity index 53% rename from .github/workflows/workflow.yml rename to .github/workflows/basic-validation.yml index 46697e9..7ee82bf 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/basic-validation.yml @@ -1,4 +1,4 @@ -name: build-test +name: Basic validation on: push: @@ -11,6 +11,6 @@ on: - '**.md' jobs: - call-basic-validation: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/basic-validation.yml + call-basic-validation: name: Basic validation uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main \ No newline at end of file diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index d51766a..1251c11 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -12,6 +12,6 @@ on: workflow_dispatch: jobs: - call-check-dist: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/check-dist.yml + call-check-dist: name: Check dist/ uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fd4d859..f1f430a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,6 +9,6 @@ on: - cron: '0 3 * * 0' jobs: - call-codeQL-analysis: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/codeql-analysis.yml + call-codeQL-analysis: name: CodeQL analysis uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main \ No newline at end of file diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index ba7cd05..88d3eae 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -9,6 +9,6 @@ on: - main jobs: - call-licensed: # The reusable workflow can be found here: https://github.com/actions/reusable-workflows/blob/main/.github/workflows/licensed.yml + call-licensed: name: Licensed uses: actions/reusable-workflows/.github/workflows/licensed.yml@main \ No newline at end of file diff --git a/package.json b/package.json index 55f38b4..99bf0b2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "tsc && ncc build -o dist/setup src/setup-go.ts && ncc build -o dist/cache-save src/cache-save.ts", "format": "prettier --write **/*.ts", "format-check": "prettier --check **/*.ts", - "lint": "", + "lint": "echo \"Fake command that does nothing. It is used in reusable workflows\"", "test": "jest --coverage", "pre-checkin": "npm run format && npm run build && npm test" },