Skip to content

Commit 6b4519e

Browse files
authored
Merge pull request #1 from wasmCloud/main
Synching with remote main branch...
2 parents a45be57 + bd91f7e commit 6b4519e

File tree

78 files changed

+4686
-2249
lines changed

Some content is hidden

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

78 files changed

+4686
-2249
lines changed

.github/actions/build-nix/action.yml

+18-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,27 @@ inputs:
88
runs:
99
using: composite
1010
steps:
11-
- run: nix build -L '.#${{ inputs.package }}'
11+
- uses: actions/cache@36f1e144e1c8edb0a652766b484448563d8baf46
12+
id: cache
13+
with:
14+
path: ${{ runner.temp }}/nix-store-${{ inputs.package }}
15+
key: ${{ inputs.package }}-${{ github.sha }}
16+
restore-keys: |
17+
${{ inputs.package }}-
18+
19+
- run: nix copy --all --from "file://${{ runner.temp }}/nix-store-${{ inputs.package }}"
20+
continue-on-error: true
21+
shell: bash
22+
- run: rm -rf "${{ runner.temp }}/nix-store-${{ inputs.package }}"
1223
shell: bash
13-
- run: nix run -L --inputs-from . 'nixpkgs#coreutils' -- --coreutils-prog=cp -RLv ./result '${{ inputs.package }}'
24+
- run: nix build --fallback -L '.#${{ inputs.package }}'
25+
shell: bash
26+
- run: nix run --fallback -L --inputs-from . 'nixpkgs#coreutils' -- --coreutils-prog=cp -RLv ./result '${{ inputs.package }}'
1427
shell: bash
1528
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
1629
with:
1730
name: ${{ inputs.package }}
1831
path: ${{ inputs.package }}
32+
- run: nix copy --to "file://${{ runner.temp }}/nix-store-${{ inputs.package }}" '.#${{ inputs.package }}'
33+
if: steps.cache.outputs.cache-hit != 'true'
34+
shell: bash

.github/release.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# .github/release.yml
2+
3+
changelog:
4+
exclude:
5+
authors:
6+
- dependabot

.github/workflows/nix.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: ./.github/actions/install-nix
3030
with:
3131
cachixAuthToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
32-
- run: nix run -L . -- --version
32+
- run: nix run --fallback -L . -- --version
3333

3434
develop:
3535
runs-on: ubuntu-22.04
@@ -38,4 +38,4 @@ jobs:
3838
- uses: ./.github/actions/install-nix
3939
with:
4040
cachixAuthToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
41-
- run: nix develop -L --ignore-environment -c cargo tree
41+
- run: nix develop --fallback -L --ignore-environment -c cargo tree

.github/workflows/provider.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
description: Provider name
88
required: true
99
type: string
10+
embed_wit:
11+
description: Whether to include the WIT in the provider archive
12+
required: false
13+
default: true
14+
type: boolean
1015
secrets:
1116
subject:
1217
description: Capability provider issuer subject key
@@ -54,14 +59,19 @@ jobs:
5459
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
5560
with:
5661
path: artifacts
62+
pattern: ${{ inputs.name }}-provider-*
5763

5864
- run: chmod +x "./artifacts/${{ inputs.name }}-provider-aarch64-apple-darwin/bin/${{ inputs.name }}-provider"
5965
- run: chmod +x "./artifacts/${{ inputs.name }}-provider-aarch64-unknown-linux-musl/bin/${{ inputs.name }}-provider"
6066
- run: chmod +x "./artifacts/${{ inputs.name }}-provider-x86_64-apple-darwin/bin/${{ inputs.name }}-provider"
6167
- run: chmod +x "./artifacts/${{ inputs.name }}-provider-x86_64-pc-windows-gnu/bin/${{ inputs.name }}-provider.exe"
6268
- run: chmod +x "./artifacts/${{ inputs.name }}-provider-x86_64-unknown-linux-musl/bin/${{ inputs.name }}-provider"
6369

64-
- run: mv "./artifacts/wash-x86_64-unknown-linux-musl/bin/wash" wash
70+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
71+
with:
72+
name: wash-x86_64-unknown-linux-musl
73+
74+
- run: mv ./bin/wash wash
6575
- run: chmod +x wash
6676

6777
- run: |
@@ -71,6 +81,9 @@ jobs:
7181
if [ "${{ secrets.subject }}" != '' ]; then
7282
export WASH_SUBJECT_KEY="${{ secrets.subject }}"
7383
fi
84+
if [[ "${{ inputs.embed_wit }}" == 'true' ]]; then
85+
export WIT_DIR="crates/provider-${{ inputs.name }}/wit"
86+
fi
7487
./wash par create \
7588
--binary "./artifacts/${{ inputs.name }}-provider-x86_64-unknown-linux-musl/bin/${{ inputs.name }}-provider" \
7689
--compress \

0 commit comments

Comments
 (0)