Skip to content

Commit ac98e26

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/sharp-0.34.5
2 parents f394bf5 + 1eda7c1 commit ac98e26

6 files changed

Lines changed: 62 additions & 10 deletions

File tree

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,27 @@ updates:
44
directory: '/'
55
schedule:
66
interval: 'weekly'
7+
groups:
8+
all:
9+
patterns:
10+
- '*'
711
- package-ecosystem: 'npm'
812
directory: '/'
913
schedule:
1014
interval: 'weekly'
15+
groups:
16+
dev-dependencies:
17+
dependency-type: 'development'
18+
patterns:
19+
- '*'
1120
- package-ecosystem: 'github-actions'
1221
directory: '/'
1322
schedule:
1423
interval: 'weekly'
24+
groups:
25+
all:
26+
patterns:
27+
- '*'
1528
- package-ecosystem: 'gitsubmodule'
1629
directory: '/'
1730
schedule:

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525

2626
- name: Submodules
2727
run: git submodule update --init --recursive
@@ -71,7 +71,7 @@ jobs:
7171
path: docs/build/html
7272

7373
- name: Upload build artifacts for debugging
74-
uses: actions/upload-artifact@v5
74+
uses: actions/upload-artifact@v6
7575
if: failure()
7676
with:
7777
name: docs-build-artifacts

.github/workflows/functional-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131

3232
- name: Submodules
3333
run: git submodule update --init --recursive
@@ -60,7 +60,7 @@ jobs:
6060

6161
- name: Upload test results
6262
if: always()
63-
uses: actions/upload-artifact@v5
63+
uses: actions/upload-artifact@v6
6464
with:
6565
name: functional-test-results-${{ inputs.environment }}
6666
path: |

.github/workflows/nodejs.yml

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Submodules
1717
run: git submodule update --init --recursive
@@ -38,7 +38,7 @@ jobs:
3838
run: npm run test:unit
3939

4040
- name: Upload build artifact
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v6
4242
with:
4343
name: build-dist
4444
path: |
@@ -51,10 +51,49 @@ jobs:
5151

5252
- name: Upload test results
5353
if: always()
54-
uses: actions/upload-artifact@v5
54+
uses: actions/upload-artifact@v6
5555
with:
5656
name: unit-test-results
5757
path: |
5858
**/*test-results*
5959
**/*coverage*
6060
retention-days: 7
61+
62+
publish-pr:
63+
if: >-
64+
github.event_name == 'pull_request' &&
65+
github.event.pull_request.head.repo.full_name == github.repository
66+
needs: build
67+
runs-on: ubuntu-latest
68+
permissions:
69+
contents: read
70+
packages: write
71+
steps:
72+
- name: Download build artifact
73+
uses: actions/download-artifact@v7
74+
with:
75+
name: build-dist
76+
path: ./package
77+
78+
- name: Setup Node.js for GitHub Packages
79+
uses: actions/setup-node@v6
80+
with:
81+
node-version: "22"
82+
registry-url: "https://npm.pkg.github.com"
83+
scope: "@crispthinking"
84+
85+
- name: Set pre-release version
86+
working-directory: ./package
87+
run: |
88+
PR_NUMBER=${{ github.event.pull_request.number }}
89+
SHORT_SHA=${GITHUB_SHA::7}
90+
VERSION="0.0.0-pr.${PR_NUMBER}.${SHORT_SHA}"
91+
npm --no-git-tag-version version "$VERSION"
92+
93+
- name: Publish pre-release package
94+
working-directory: ./package
95+
env:
96+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97+
run: |
98+
PR_TAG="pr-${{ github.event.pull_request.number }}"
99+
npm publish --tag "$PR_TAG"

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
id-token: write # Required for OIDC
2222

2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525
with:
2626
submodules: recursive
2727

28-
- uses: actions/setup-node@v4
28+
- uses: actions/setup-node@v6
2929
with:
3030
node-version: "22"
3131
registry-url: "https://registry.npmjs.org"

0 commit comments

Comments
 (0)