From 6801e060eada89a47ba211b8b8f763525844433c Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Thu, 4 Jan 2024 08:25:35 -0800 Subject: [PATCH 1/5] ci: simplifies integration test job names Signed-off-by: Takeshi Yoneda --- .github/workflows/integration.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 794303f9ca..e90a3e469b 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -82,7 +82,7 @@ jobs: zig: needs: build_zig_test_binary - name: Zig (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: Zig (${{ runner.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -196,7 +196,7 @@ jobs: tinygo: needs: build_tinygo_test_binary - name: TinyGo (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: TinyGo (${{ runner.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -272,7 +272,7 @@ jobs: wasi-testsuite: name: wasi-testsuite - runs-on: ${{ matrix.os }} + runs-on: ${{ runner.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific matrix: @@ -327,7 +327,7 @@ jobs: -r ../.github/wasi_testsuite_adapter.py gojs_stdlib: - name: Go (js) (${{ matrix.os }}) + name: Go (js) (${{ runner.os }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -360,7 +360,7 @@ jobs: go_tests: # Due to the embedding of the GOROOT of the building env(https://github.com/golang/go/blob/3c59639b902fada0a2e5a6a35bafd10fc9183b89/src/os/os_test.go#L112), # we have to build and cache on each OS unlike others in this file. - name: Go (${{ matrix.os }}, Go-${{ matrix.go-version }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: Go-${{ matrix.go-version }} (${{ runner.os }},${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific From ca85ec7a3c32178982410a5f99dd7a7b9bc81909 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Thu, 4 Jan 2024 08:43:35 -0800 Subject: [PATCH 2/5] more Signed-off-by: Takeshi Yoneda --- .github/workflows/integration.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index e90a3e469b..7ec5104b62 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -82,7 +82,7 @@ jobs: zig: needs: build_zig_test_binary - name: Zig (${{ runner.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: Zig (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -196,7 +196,7 @@ jobs: tinygo: needs: build_tinygo_test_binary - name: TinyGo (${{ runner.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: TinyGo (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -272,7 +272,7 @@ jobs: wasi-testsuite: name: wasi-testsuite - runs-on: ${{ runner.os }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific matrix: @@ -327,7 +327,7 @@ jobs: -r ../.github/wasi_testsuite_adapter.py gojs_stdlib: - name: Go (js) (${{ runner.os }}) + name: Go (js) (${{ matrix.os }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -360,7 +360,7 @@ jobs: go_tests: # Due to the embedding of the GOROOT of the building env(https://github.com/golang/go/blob/3c59639b902fada0a2e5a6a35bafd10fc9183b89/src/os/os_test.go#L112), # we have to build and cache on each OS unlike others in this file. - name: Go-${{ matrix.go-version }} (${{ runner.os }},${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: Go-${{ matrix.go-version }} (${{ matrix.os }},${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific From 2bd44e607168e7c1a84527c2119cd239084a6534 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Thu, 4 Jan 2024 08:44:08 -0800 Subject: [PATCH 3/5] more Signed-off-by: Takeshi Yoneda --- .github/workflows/integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 7ec5104b62..c9e9300e56 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -82,7 +82,7 @@ jobs: zig: needs: build_zig_test_binary - name: Zig (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: Zig (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific @@ -196,7 +196,7 @@ jobs: tinygo: needs: build_tinygo_test_binary - name: TinyGo (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) + name: TinyGo (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific From 6c61000402b402cbd4727c584868e86877dc72bd Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Thu, 4 Jan 2024 08:58:06 -0800 Subject: [PATCH 4/5] more Signed-off-by: Takeshi Yoneda --- .github/workflows/integration.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index c9e9300e56..dfa2849616 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -7,7 +7,7 @@ on: - 'site/**' - 'netlify.toml' push: - branches: [main] + branches: [cisimplify] paths-ignore: # ignore docs as they are built with Netlify. - '**/*.md' - 'site/**' @@ -360,18 +360,26 @@ jobs: go_tests: # Due to the embedding of the GOROOT of the building env(https://github.com/golang/go/blob/3c59639b902fada0a2e5a6a35bafd10fc9183b89/src/os/os_test.go#L112), # we have to build and cache on each OS unlike others in this file. - name: Go-${{ matrix.go-version }} (${{ matrix.os }},${{ matrix.arch }}, ${{ matrix.compiler }}-compiler) - runs-on: ${{ matrix.os }} + name: Go-${{ matrix.go-version }} (${{ matrix.os.name }},${{ matrix.arch }}, ${{ matrix.compiler }}) + runs-on: ${{ matrix.os.version }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + os: + - version: ubuntu-22.04 + name: Ubuntu + - version: macos-12 + name: macOS + - version: windows-2022 + name: Windows compiler: [baseline] arch: [amd64] go-version: - "1.21" # Current Go version && The only version that supports wasip1. include: - - os: ubuntu-22.04 + - os: + version: ubuntu-22.04 + name: Ubuntu compiler: optimizing arch: "arm64" go-version: "1.21" From fe5bebfa43117e7a85e4b4338fbb76cb5b74142c Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Thu, 4 Jan 2024 09:02:31 -0800 Subject: [PATCH 5/5] more Signed-off-by: Takeshi Yoneda --- .github/workflows/integration.yaml | 44 ++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index dfa2849616..073d671b82 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -7,7 +7,7 @@ on: - 'site/**' - 'netlify.toml' push: - branches: [cisimplify] + branches: [main] paths-ignore: # ignore docs as they are built with Netlify. - '**/*.md' - 'site/**' @@ -82,16 +82,26 @@ jobs: zig: needs: build_zig_test_binary - name: Zig (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) - runs-on: ${{ matrix.os }} + name: Zig (${{ matrix.os.name }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) + runs-on: ${{ matrix.os.version }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + # version is too verbose to be present in the name, so we use the name instead. + # Note that it'd be better to use runner.os in the name, but the runner context is not available in the name field. + os: + - version: ubuntu-22.04 + name: Ubuntu + - version: macos-12 + name: macOS + - version: windows-2022 + name: Windows compiler: [baseline] arch: [amd64] include: - - os: ubuntu-22.04 + - os: + version: ubuntu-22.04 + name: Ubuntu compiler: optimizing arch: "arm64" @@ -196,16 +206,26 @@ jobs: tinygo: needs: build_tinygo_test_binary - name: TinyGo (${{ matrix.os }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) - runs-on: ${{ matrix.os }} + name: TinyGo (${{ matrix.os.name }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) + runs-on: ${{ matrix.os.version }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + # version is too verbose to be present in the name, so we use the name instead. + # Note that it'd be better to use runner.os in the name, but the runner context is not available in the name field. + os: + - version: ubuntu-22.04 + name: Ubuntu + - version: macos-12 + name: macOS + - version: windows-2022 + name: Windows compiler: [baseline] arch: [amd64] include: - - os: ubuntu-22.04 + - os: + version: ubuntu-22.04 + name: Ubuntu compiler: optimizing arch: "arm64" @@ -360,11 +380,13 @@ jobs: go_tests: # Due to the embedding of the GOROOT of the building env(https://github.com/golang/go/blob/3c59639b902fada0a2e5a6a35bafd10fc9183b89/src/os/os_test.go#L112), # we have to build and cache on each OS unlike others in this file. - name: Go-${{ matrix.go-version }} (${{ matrix.os.name }},${{ matrix.arch }}, ${{ matrix.compiler }}) + name: Go-${{ matrix.go-version }} (${{ matrix.os.name }}, ${{ matrix.arch }}, ${{ matrix.compiler }}) runs-on: ${{ matrix.os.version }} strategy: fail-fast: false # don't fail fast as sometimes failures are arch/OS specific matrix: + # version is too verbose to be present in the name, so we use the name instead. + # Note that it'd be better to use runner.os in the name, but the runner context is not available in the name field. os: - version: ubuntu-22.04 name: Ubuntu @@ -399,7 +421,7 @@ jobs: path: ${{ env.STDLIB_TESTS }}/testdata/go # Use precise Go version from setup-go as patch version differences can effect tests. - key: go-wasip1-binaries-${{ matrix.os }}-${{ steps.setup-go.outputs.go-version }}-${{ matrix.arch }} + key: go-wasip1-binaries-${{ matrix.os.version }}-${{ steps.setup-go.outputs.go-version }}-${{ matrix.arch }} - if: ${{ matrix.compiler == 'optimizing' }} name: Build wazero