Skip to content

Commit 4fa3e45

Browse files
brooksmtownsendbrooksmtownsend
committed
bring back steps
Signed-off-by: Brooks Townsend <brooksmtownsend@gmail.com>
1 parent 1483856 commit 4fa3e45

File tree

1 file changed

+101
-112
lines changed

1 file changed

+101
-112
lines changed

‎.github/workflows/wash.yml

Lines changed: 101 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -39,139 +39,128 @@ jobs:
3939
- 'crates/secrets-types/**'
4040
- 'crates/wash-cli/**'
4141
- 'crates/wash-lib/**'
42+
4243
unit_tests:
4344
needs: [should_run]
4445
if: ${{ needs.should_run.outputs.modified }}
45-
name: Basic check
46+
name: Unit Tests
4647
strategy:
4748
fail-fast: false # Ensure we can run the full suite even if one OS fails
4849
matrix:
49-
os: [ubuntu-latest, macos-13]
50+
os: [ubuntu-latest-4-cores, windows-latest, macos-13]
5051
runs-on: ${{ matrix.os }}
5152
steps:
52-
- run: exit 0
53-
54-
# unit_tests:
55-
# needs: [should_run]
56-
# if: ${{ needs.should_run.outputs.modified }}
57-
# name: Unit Tests
58-
# strategy:
59-
# fail-fast: false # Ensure we can run the full suite even if one OS fails
60-
# matrix:
61-
# os: [ubuntu-latest-4-cores, windows-latest, macos-13]
62-
# runs-on: ${{ matrix.os }}
63-
# steps:
64-
# - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
65-
# with:
66-
# node-version: "18.x"
67-
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
68-
# - run: rustup show
69-
# - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
70-
# with:
71-
# shared-key: "${{ matrix.os }}-shared-cache"
72-
# - name: Install nextest
73-
# uses: taiki-e/install-action@2c3c8dfabf5933531aca0613c6b0c173fa51745e
74-
# with:
75-
# tool: nextest,wit-bindgen-cli
76-
# - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
77-
# with:
78-
# go-version: ${{ env.GO_VERSION }}
79-
# - uses: acifani/setup-tinygo@b2ba42b249c7d3efdfe94166ec0f48b3191404f7
80-
# with:
81-
# tinygo-version: ${{ env.TINYGO_VERSION }}
82-
# install-binaryen: "false"
53+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
54+
with:
55+
node-version: "18.x"
56+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
57+
- run: rustup show
58+
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
59+
with:
60+
shared-key: "${{ matrix.os }}-shared-cache"
61+
- name: Install nextest
62+
uses: taiki-e/install-action@2c3c8dfabf5933531aca0613c6b0c173fa51745e
63+
with:
64+
tool: nextest,wit-bindgen-cli
65+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
66+
with:
67+
go-version: ${{ env.GO_VERSION }}
68+
- uses: acifani/setup-tinygo@b2ba42b249c7d3efdfe94166ec0f48b3191404f7
69+
with:
70+
tinygo-version: ${{ env.TINYGO_VERSION }}
71+
install-binaryen: "false"
8372

84-
# # Run builds and tests only on Linux and macOS for PRs, Windows on `main`
85-
# - name: Build wash
86-
# if: ${{ matrix.os != 'windows-latest' || github.ref == 'refs/heads/main' }}
87-
# run: make build
88-
# working-directory: ./crates/wash-cli
73+
# Run builds and tests only on Linux and macOS for PRs, Windows on `main`
74+
- name: Build wash
75+
if: ${{ matrix.os != 'windows-latest' || github.ref == 'refs/heads/main' }}
76+
run: make build
77+
working-directory: ./crates/wash-cli
8978

90-
# - name: Run all wash & wash-lib unit tests
91-
# if: ${{ matrix.os != 'windows-latest' || github.ref == 'refs/heads/main' }}
92-
# run: make test-wash-ci
93-
# working-directory: ./crates/wash-cli
79+
- name: Run all wash & wash-lib unit tests
80+
if: ${{ matrix.os != 'windows-latest' || github.ref == 'refs/heads/main' }}
81+
run: make test-wash-ci
82+
working-directory: ./crates/wash-cli
9483

95-
# integration_tests:
96-
# needs: [should_run]
97-
# if: ${{ needs.should_run.outputs.modified }}
98-
# name: Integration Tests
99-
# runs-on: ubuntu-22.04
100-
# steps:
101-
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
102-
# - run: rustup show
103-
# - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
104-
# with:
105-
# shared-key: "ubuntu-22.04-shared-cache"
106-
# - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
107-
# with:
108-
# go-version: ${{ env.GO_VERSION }}
109-
# - uses: acifani/setup-tinygo@b2ba42b249c7d3efdfe94166ec0f48b3191404f7
110-
# with:
111-
# tinygo-version: ${{ env.TINYGO_VERSION }}
112-
# install-binaryen: "false"
113-
# - name: Launch integration test services
114-
# uses: sudo-bot/action-docker-compose@ef4c4da08a9673f93d4eb8a5da1e942bf24a37ea
115-
# with:
116-
# cli-args: "-f ./crates/wash-cli/tools/docker-compose.yml up --detach"
117-
# - name: Install nextest
118-
# uses: taiki-e/install-action@2c3c8dfabf5933531aca0613c6b0c173fa51745e
119-
# with:
120-
# tool: nextest,wit-bindgen-cli,wasm-tools
121-
# - name: Run integration tests
122-
# run: make test-integration-ci
123-
# working-directory: ./crates/wash-cli
84+
integration_tests:
85+
needs: [should_run]
86+
if: ${{ needs.should_run.outputs.modified }}
87+
name: Integration Tests
88+
runs-on: ubuntu-22.04
89+
steps:
90+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
91+
- run: rustup show
92+
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
93+
with:
94+
shared-key: "ubuntu-22.04-shared-cache"
95+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
96+
with:
97+
go-version: ${{ env.GO_VERSION }}
98+
- uses: acifani/setup-tinygo@b2ba42b249c7d3efdfe94166ec0f48b3191404f7
99+
with:
100+
tinygo-version: ${{ env.TINYGO_VERSION }}
101+
install-binaryen: "false"
102+
- name: Launch integration test services
103+
uses: sudo-bot/action-docker-compose@ef4c4da08a9673f93d4eb8a5da1e942bf24a37ea
104+
with:
105+
cli-args: "-f ./crates/wash-cli/tools/docker-compose.yml up --detach"
106+
- name: Install nextest
107+
uses: taiki-e/install-action@2c3c8dfabf5933531aca0613c6b0c173fa51745e
108+
with:
109+
tool: nextest,wit-bindgen-cli,wasm-tools
110+
- name: Run integration tests
111+
run: make test-integration-ci
112+
working-directory: ./crates/wash-cli
124113

125-
# # Regression E2E tests to ensure that `wash new component` works consistently,
126-
# # including older (released) versions of `wash`
127-
# e2e_tests_wash_new_actor:
128-
# needs: [should_run]
129-
# if: ${{ needs.should_run.outputs.modified }}
130-
# name: E2E Tests (`wash new`)
131-
# runs-on: ubuntu-22.04
132-
# strategy:
133-
# matrix:
134-
# wash-version:
135-
# - current
136-
# template:
137-
# - name: hello-world-rust
138-
# lang: rust
139-
# - name: hello-world-tinygo
140-
# lang: tinygo
141-
# lang-version: "1.23"
142-
# - name: hello-world-typescript
143-
# lang: typescript
144-
# lang-version: "22.x"
145-
# - name: hello-world-python
146-
# lang: python
147-
# lang-version: "3.10"
148-
# steps:
149-
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
114+
# Regression E2E tests to ensure that `wash new component` works consistently,
115+
# including older (released) versions of `wash`
116+
e2e_tests_wash_new_actor:
117+
needs: [should_run]
118+
if: ${{ needs.should_run.outputs.modified }}
119+
name: E2E Tests (`wash new`)
120+
runs-on: ubuntu-22.04
121+
strategy:
122+
matrix:
123+
wash-version:
124+
- current
125+
template:
126+
- name: hello-world-rust
127+
lang: rust
128+
- name: hello-world-tinygo
129+
lang: tinygo
130+
lang-version: "1.23"
131+
- name: hello-world-typescript
132+
lang: typescript
133+
lang-version: "22.x"
134+
- name: hello-world-python
135+
lang: python
136+
lang-version: "3.10"
137+
steps:
138+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
150139

151-
# # Set up language toolchain
152-
# - name: Setup WebAssembly toolchains for language
153-
# uses: ./.github/actions/wasm-lang-toolchain-setup
154-
# with:
155-
# language: ${{ matrix.template.lang }}
156-
# language-version: ${{ matrix.template.lang-version }}
157-
# wash-version: ${{ matrix.wash-version }}
140+
# Set up language toolchain
141+
- name: Setup WebAssembly toolchains for language
142+
uses: ./.github/actions/wasm-lang-toolchain-setup
143+
with:
144+
language: ${{ matrix.template.lang }}
145+
language-version: ${{ matrix.template.lang-version }}
146+
wash-version: ${{ matrix.wash-version }}
158147

159-
# # Set up Rust & trigger cargo toolchain
160-
# - run: rustup show
161-
# - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
162-
# with:
163-
# shared-key: "ubuntu-22.04-shared-cache"
148+
# Set up Rust & trigger cargo toolchain
149+
- run: rustup show
150+
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
151+
with:
152+
shared-key: "ubuntu-22.04-shared-cache"
164153

165-
# - name: Ensure `wash new` works
166-
# run: wash new component ${{ matrix.template.name }} --template-name ${{ matrix.template.name }}
154+
- name: Ensure `wash new` works
155+
run: wash new component ${{ matrix.template.name }} --template-name ${{ matrix.template.name }}
167156

168157
# This check always runs, and only succeeds if wash tests should run and they pass
169158
wash_successful_checks:
170159
needs:
171160
- should_run
172161
- unit_tests
173-
# - integration_tests
174-
# - e2e_tests_wash_new_actor
162+
- integration_tests
163+
- e2e_tests_wash_new_actor
175164
if: ${{ always() }}
176165
runs-on: ubuntu-latest
177166
steps:

0 commit comments

Comments
 (0)