Skip to content

Commit 2c6bb2e

Browse files
authored
Merge branch 'main' into dependabot-alerts
2 parents a015e03 + 606f2de commit 2c6bb2e

File tree

8 files changed

+62
-28
lines changed

8 files changed

+62
-28
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
node: [18]
10+
node: [ 18 ]
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313

1414
- name: Setup Node.js ${{ matrix.node }}
15-
uses: actions/setup-node@v2
15+
uses: actions/setup-node@v4
1616
with:
1717
node-version: ${{ matrix.node }}
1818

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,35 +38,35 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
45+
uses: github/codeql-action/init@v3
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
4949
# By default, queries listed here will override any specified in a config file.
5050
# Prefix the list here with "+" to use these queries and those in the config file.
51-
51+
5252
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5353
# queries: security-extended,security-and-quality
5454

55-
55+
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
59+
uses: github/codeql-action/autobuild@v3
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6363

64-
# If the Autobuild fails above, remove it and uncomment the following three lines.
64+
# If the Autobuild fails above, remove it and uncomment the following three lines.
6565
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
6666

6767
# - run: |
6868
# echo "Run, Build Application using script"
6969
# ./location_of_script_within_repo/buildscript.sh
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
72+
uses: github/codeql-action/analyze@v3

.github/workflows/deploy_cdn.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ on:
88
jobs:
99
Deploy:
1010
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
node: [ 18 ]
1114
env:
1215
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
1316
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1417
PACKAGE_NAME: '@ibm-aspera/connect-sdk-js'
1518
steps:
16-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
1720

18-
- name: Setup Node.js
19-
uses: actions/setup-node@v2
21+
- name: Setup Node.js ${{ matrix.node }}
22+
uses: actions/setup-node@v4
2023
with:
21-
node-version: 14
24+
node-version: ${{ matrix.node }}
2225

2326
- name: Install dependencies
2427
run: npm ci
@@ -27,7 +30,7 @@ jobs:
2730
run: npm run build
2831

2932
- name: Set up Python
30-
uses: actions/setup-python@v2
33+
uses: actions/setup-python@v5
3134
with:
3235
python-version: '3.12'
3336

.github/workflows/docs.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,16 @@ on:
88
jobs:
99
Documentation:
1010
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
node: [ 18 ]
1114
steps:
12-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
16+
17+
- name: Setup Node.js ${{ matrix.node }}
18+
uses: actions/setup-node@v4
19+
with:
20+
node-version: ${{ matrix.node }}
1321

1422
- name: Install dependencies
1523
run: |
@@ -20,8 +28,20 @@ jobs:
2028
npm run build
2129
npm run docs
2230
23-
- name: Deploy
24-
uses: JamesIves/github-pages-deploy-action@v4.2.2
31+
- name: Upload Pages Artifact
32+
uses: actions/upload-pages-artifact@v3
2533
with:
26-
branch: gh-pages
27-
folder: dist/docs
34+
path: dist/docs
35+
Deploy:
36+
needs: Documentation
37+
runs-on: ubuntu-latest
38+
permissions:
39+
pages: write
40+
id-token: write
41+
environment:
42+
name: github-pages
43+
url: ${{ steps.deployment.outputs.page_url }}
44+
steps:
45+
- name: Deploy to GitHub Pages
46+
id: deployment
47+
uses: actions/deploy-pages@v4

.github/workflows/npm_upload.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ on:
88
jobs:
99
Publish:
1010
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
node: [ 18 ]
1114
steps:
12-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1316

14-
- name: Setup Node.js
15-
uses: actions/setup-node@v2
17+
- name: Setup Node.js ${{ matrix.node }}
18+
uses: actions/setup-node@v4
1619
with:
17-
node-version: 14
20+
node-version: ${{ matrix.node }}
1821

1922
- name: Install dependencies
2023
run: |
@@ -25,7 +28,7 @@ jobs:
2528
npm run build
2629
2730
- name: Publish
28-
uses: JS-DevTools/npm-publish@v1
31+
uses: JS-DevTools/npm-publish@v3
2932
with:
3033
access: public
3134
token: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ on:
1010
jobs:
1111
Release:
1212
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
node: [ 18 ]
1316
env:
1417
RELEASE_VERSION: ${{ github.event.inputs.version }}
1518
steps:
16-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
1720
with:
1821
token: ${{ secrets.GH_PAT }} # Needed to properly trigger workflow events
1922

@@ -22,6 +25,11 @@ jobs:
2225
git config user.name github-actions
2326
git config user.email github-actions@github.com
2427
28+
- name: Setup Node.js ${{ matrix.node }}
29+
uses: actions/setup-node@v4
30+
with:
31+
node-version: ${{ matrix.node }}
32+
2533
- name: Bump version
2634
run: |
2735
npm run release -- --release-as ${{ env.RELEASE_VERSION }} --no-verify --skip.changelog

.github/workflows/whitesource.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
- name: Run Whitesource Action
1616
uses: TheAxZim/Whitesource-Scan-Action@v1.0.0

scripts/deploy-cdn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ const bucketPath = `${bucketName}/${packageName}/${tagName}`;
66

77
// Sync to s3 and invalidate
88
const syncCommand = `aws s3 sync . s3://${bucketPath} --delete --acl public-read`
9-
const invalidationCommand = `aws cloudfront create-invalidation --distribution-id ${distId} --paths ${bucketPath}/*`
9+
const invalidationCommand = `aws cloudfront create-invalidation --distribution-id ${distId} --paths /${packageName}/${tagName}/*`
1010
execSync(syncCommand, { stdio: 'inherit', cwd: folder });
1111
execSync(invalidationCommand, { stdio: 'inherit', cwd: folder });

0 commit comments

Comments
 (0)