From caaa9d738ffb1b3e191b8b917a6dcdbe4ec6acc5 Mon Sep 17 00:00:00 2001
From: IvanZosimov <ivanzosimov@github.com>
Date: Wed, 14 Dec 2022 14:53:47 +0100
Subject: [PATCH] Update workflows to use reusable-workflows
---
.github/workflows/build.yml | 21 +++-----------
.github/workflows/check-dist.yml | 42 +++------------------------
.github/workflows/codeql-analysis.yml | 14 +++++++++
.github/workflows/licensed.yml | 17 +++--------
package.json | 1 +
5 files changed, 27 insertions(+), 68 deletions(-)
create mode 100644 .github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d665b3..63d055a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,20 +12,7 @@ on:
- '**.md'
jobs:
- build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-latest, windows-latest, macos-latest]
- steps:
- - uses: actions/checkout@v3
- - name: Setup Node.JS 16
- uses: actions/setup-node@v3
- with:
- node-version: 16.x
- cache: npm
- - run: npm ci
- - run: npm run build
- - run: npm run format-check
- - run: npm test
\ No newline at end of file
+ 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
\ No newline at end of file
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
index 6274fd2..41eca4b 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
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..4491124
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,14 @@
+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 fd70702..5a8c073 100644
--- a/.github/workflows/licensed.yml
+++ b/.github/workflows/licensed.yml
@@ -10,16 +10,7 @@ on:
workflow_dispatch:
jobs:
- test:
- runs-on: ubuntu-latest
- name: Check licenses
- steps:
- - uses: actions/checkout@v3
- - 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
diff --git a/package.json b/package.json
index 9cb00e1..e7ae7ba 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
"build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
"format": "prettier --write \"{,!(node_modules)/**/}*.ts\"",
"format-check": "prettier --check \"{,!(node_modules)/**/}*.ts\"",
+ "lint": "",
"prerelease": "npm run-script build",
"release": "git add -f dist/setup/index.js dist/cleanup/index.js",
"test": "jest"