Skip to content

Commit 164ca36

Browse files
committed
Merge branch 'release' into deploy-web
2 parents fb9b3c2 + 893ee59 commit 164ca36

File tree

340 files changed

+37547
-13075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+37547
-13075
lines changed
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Compute artifact names
2+
description: Central place for computing the artifact names in the CI builds.
3+
4+
inputs:
5+
build-name:
6+
description: >
7+
The build name (e.g., linux-x86_64, macos-aarch64, etc.). The special
8+
value "all" can be used to receive a glob that matches all of the build
9+
names.
10+
required: true
11+
12+
runs:
13+
using: composite
14+
15+
steps:
16+
- name: Check valid build name
17+
if: >
18+
! contains(
19+
fromJson('[
20+
"all",
21+
"linux-x86_64",
22+
"linux-x86_64-static",
23+
"macos-x86_64",
24+
"macos-aarch64",
25+
"macos-universal"
26+
]'),
27+
inputs.build-name
28+
)
29+
shell: sh
30+
run: |
31+
echo '::error::Invalid build name provided: ${{ inputs.build-name }}.'
32+
exit 1
33+
34+
- name: Set artifact names
35+
id: set-artifact-names
36+
shell: sh
37+
env:
38+
BUILD_NAME: ${{ inputs.build-name == 'all' && '*' || inputs.build-name }}
39+
run: |
40+
echo "artifact-name=wasp-cli-${BUILD_NAME}" >> $GITHUB_OUTPUT
41+
echo "tarball-name=wasp-${BUILD_NAME}.tar.gz" >> $GITHUB_OUTPUT
42+
43+
- name: Set npm target
44+
id: set-npm-target
45+
if: inputs.build-name != 'all' && inputs.build-name != 'macos-universal'
46+
shell: sh
47+
run: |
48+
case '${{ inputs.build-name }}' in
49+
linux-x86_64) npm_target='{"os":"linux","cpu":"x64","libc":"glibc"}' ;;
50+
linux-x86_64-static) npm_target='{"os":"linux","cpu":"x64","libc":"musl"}' ;;
51+
macos-x86_64) npm_target='{"os":"darwin","cpu":"x64"}' ;;
52+
macos-aarch64) npm_target='{"os":"darwin","cpu":"arm64"}' ;;
53+
esac
54+
55+
echo "npm-target=$npm_target" >>"$GITHUB_OUTPUT"
56+
57+
outputs:
58+
artifact-name:
59+
value: ${{ steps.set-artifact-names.outputs.artifact-name }}
60+
description: "The name of the artifact attached to the CI build."
61+
tarball-name:
62+
value: ${{ steps.set-artifact-names.outputs.tarball-name }}
63+
description: "The name of the tarball inside the artifact."
64+
npm-target:
65+
value: ${{ steps.set-npm-target.outputs.npm-target }}
66+
description: "A JSON-encoded object of {os, cpu, libc?} for this build."

.github/actions/fetch-nightly-cli/README.md

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/actions/fetch-nightly-cli/action.yaml

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/actions/setup-haskell/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ inputs:
1515
description: |
1616
The version of Cabal to install.
1717
required: false
18-
default: "3.10.2.0"
18+
default: "3.12.1.0"
1919

2020
cabal-project-dir:
2121
description: |

.github/workflows/automation-cache-evict.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626

2727
- name: Evict caches
2828
shell: bash
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: "Automation - Label external PRs"
2+
3+
############################################################
4+
# CAUTION: This workflow should not check out the PR code! #
5+
############################################################
6+
# The `pull_request_target` event is only intended for simple automations on the
7+
# PRs themselves (e.g., labeling, commenting). If we checked out the PR code here,
8+
# we would be running untrusted code and giving it access to our repository
9+
# secrets, which is a major security risk.
10+
#
11+
# More info at:
12+
# https://securitylab.github.com/resources/github-actions-preventing-pwn-requests/
13+
14+
on:
15+
pull_request_target:
16+
types:
17+
- opened
18+
- reopened
19+
- ready_for_review
20+
21+
jobs:
22+
label-external-prs:
23+
name: Label external PRs
24+
runs-on: ubuntu-latest
25+
26+
permissions:
27+
pull-requests: write
28+
29+
# We check if the PR comes from a different repo than ours:
30+
if: github.event.pull_request.head.repo.full_name != github.repository
31+
32+
steps:
33+
- name: Label external PR
34+
run: gh pr edit "$PR_NUMBER" --add-label "$LABEL_NAME"
35+
env:
36+
LABEL_NAME: "external"
37+
PR_NUMBER: ${{ github.event.pull_request.number }}
38+
GH_TOKEN: ${{ github.token }}
39+
GH_REPO: ${{ github.repository }}

.github/workflows/ci-deploy-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
name: fly-deploy-test
2727

2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030

3131
- uses: ./.github/actions/setup-haskell
3232

33-
- uses: actions/setup-node@v5
33+
- uses: actions/setup-node@v6
3434
with:
3535
cache: "npm"
3636
node-version: "22"

.github/workflows/ci-examples-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
- kitchen-sink
2424

2525
steps:
26-
- uses: "actions/checkout@v5"
26+
- uses: "actions/checkout@v6"
2727

2828
- uses: ./.github/actions/setup-haskell
2929
with:
3030
cabal-project-dir: waspc
3131

32-
- uses: actions/setup-node@v5
32+
- uses: actions/setup-node@v6
3333
with:
3434
node-version: lts/*
3535

.github/workflows/ci-formatting.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
prettier:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717

18-
- uses: actions/setup-node@v5
18+
- uses: actions/setup-node@v6
1919
with:
2020
cache: "npm"
2121
node-version: "22"
@@ -33,7 +33,7 @@ jobs:
3333
git config --global core.autocrlf input
3434
git config --global core.eol lf
3535
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737

3838
- name: Parse oromolu version
3939
working-directory: waspc
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Test - Publish nightly Wasp npm packages to pkg.pr.new"
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
publish:
8+
name: Publish packages
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/setup-node@v6
13+
14+
- uses: actions/download-artifact@v6
15+
with:
16+
name: wasp-npm-packages
17+
path: packages/
18+
19+
- name: Publish Wasp npm packages
20+
run: npx pkg-pr-new publish --bin ./packages/*

0 commit comments

Comments
 (0)