From 34787dc0f6f169c6f555f09860d597d4affde38e Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Sat, 10 Feb 2024 11:53:39 +0100 Subject: [PATCH 01/10] add 32 bits DLL support --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ed1b5b..8d50723 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,7 +107,34 @@ jobs: path: | *.so *.h - build-windows: + build-windows-32: + runs-on: windows-2019 + needs: + - test-linux + - test-windows + - test-mac + steps: + - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: antlr4 + path: pkg/a2l/parser + - uses: actions/download-artifact@v3 + with: + name: grpc + path: pkg/a2l + - run: | + go get github.com/antlr4-go/antlr/v4 + $env:GOARCH=386 + $env:CGO_ENABLED=1 + go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go + - uses: actions/upload-artifact@v3 + with: + name: windows + path: | + *.dll + *.h + build-windows-64: runs-on: windows-2019 needs: - test-linux @@ -177,7 +204,8 @@ jobs: contents: write needs: - build-linux - - build-windows + - build-windows-32 + - build-windows-64 - build-mac - export-protobuf-definitions if: startsWith(github.ref, 'refs/tags/v') From 96af14f79c08fb7f0c0d6762dc473a211c3f0e23 Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Mon, 12 Feb 2024 07:01:40 +0100 Subject: [PATCH 02/10] update Action versions --- .github/workflows/build.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d50723..de7411a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,9 +6,9 @@ jobs: generate-antlr-sources: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./generate_antlr.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: antlr4 path: | @@ -16,9 +16,9 @@ jobs: generate-grpc-sources: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./generate_grpc.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: grpc path: | @@ -29,7 +29,7 @@ jobs: - generate-antlr-sources - generate-grpc-sources steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: antlr4 @@ -47,7 +47,7 @@ jobs: - generate-antlr-sources - generate-grpc-sources steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: antlr4 @@ -89,7 +89,7 @@ jobs: - test-windows - test-mac steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: antlr4 @@ -101,7 +101,7 @@ jobs: - run: | go get github.com/antlr4-go/antlr/v4 go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).so ./cmd/a2l/a2l.go - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: linux path: | @@ -114,7 +114,7 @@ jobs: - test-windows - test-mac steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: antlr4 @@ -128,7 +128,7 @@ jobs: $env:GOARCH=386 $env:CGO_ENABLED=1 go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: windows path: | @@ -141,7 +141,7 @@ jobs: - test-windows - test-mac steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: antlr4 @@ -153,7 +153,7 @@ jobs: - run: | go get github.com/antlr4-go/antlr/v4 go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: windows path: | @@ -192,8 +192,8 @@ jobs: export-protobuf-definitions: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions/upload-artifact@v3 + - uses: actions/checkout@v4 + - uses: actions/upload-artifact@v4 with: name: protobuf path: | @@ -210,7 +210,7 @@ jobs: - export-protobuf-definitions if: startsWith(github.ref, 'refs/tags/v') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: mkdir a2l_grpc - uses: actions/download-artifact@v3 with: From f2f04c55a844017a0fe49ef2f3e45c254b725119 Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Mon, 12 Feb 2024 07:02:34 +0100 Subject: [PATCH 03/10] temporarily disable MacOS support --- .github/workflows/build.yml | 122 ++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de7411a..09e539f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,35 +59,35 @@ jobs: - run: | go get github.com/antlr4-go/antlr/v4 go test ./cmd/a2l/... - test-mac: - runs-on: macos-latest-xlarge - needs: - - generate-antlr-sources - - generate-grpc-sources - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 - with: - name: antlr4 - path: pkg/a2l/parser - - uses: actions/download-artifact@v3 - with: - name: grpc - path: pkg/a2l - - name: Set up Go 1.21 - uses: actions/setup-go@v4 - with: - go-version: "1.21" - cache: true - - run: | - go get github.com/antlr4-go/antlr/v4 - go test ./cmd/a2l/... +# test-mac: +# runs-on: macos-latest-xlarge +# needs: +# - generate-antlr-sources +# - generate-grpc-sources +# steps: +# - uses: actions/checkout@v4 +# - uses: actions/download-artifact@v3 +# with: +# name: antlr4 +# path: pkg/a2l/parser +# - uses: actions/download-artifact@v3 +# with: +# name: grpc +# path: pkg/a2l +# - name: Set up Go 1.21 +# uses: actions/setup-go@v4 +# with: +# go-version: "1.21" +# cache: true +# - run: | +# go get github.com/antlr4-go/antlr/v4 +# go test ./cmd/a2l/... build-linux: runs-on: ubuntu-22.04 needs: - test-linux - test-windows - - test-mac +# - test-mac steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 @@ -112,7 +112,7 @@ jobs: needs: - test-linux - test-windows - - test-mac +# - test-mac steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 @@ -139,7 +139,7 @@ jobs: needs: - test-linux - test-windows - - test-mac +# - test-mac steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 @@ -159,36 +159,36 @@ jobs: path: | *.dll *.h - build-mac: - runs-on: macos-latest-xlarge - needs: - - test-linux - - test-windows - - test-mac - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 - with: - name: antlr4 - path: pkg/a2l/parser - - uses: actions/download-artifact@v3 - with: - name: grpc - path: pkg/a2l - - name: Set up Go 1.21 - uses: actions/setup-go@v4 - with: - go-version: "1.21" - cache: true - - run: | - go get github.com/antlr4-go/antlr/v4 - go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dylib ./cmd/a2l/a2l.go - - uses: actions/upload-artifact@v3 - with: - name: mac - path: | - *.dylib - *.h +# build-mac: +# runs-on: macos-latest-xlarge +# needs: +# - test-linux +# - test-windows +# - test-mac +# steps: +# - uses: actions/checkout@v4 +# - uses: actions/download-artifact@v3 +# with: +# name: antlr4 +# path: pkg/a2l/parser +# - uses: actions/download-artifact@v3 +# with: +# name: grpc +# path: pkg/a2l +# - name: Set up Go 1.21 +# uses: actions/setup-go@v4 +# with: +# go-version: "1.21" +# cache: true +# - run: | +# go get github.com/antlr4-go/antlr/v4 +# go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dylib ./cmd/a2l/a2l.go +# - uses: actions/upload-artifact@v4 +# with: +# name: mac +# path: | +# *.dylib +# *.h export-protobuf-definitions: runs-on: ubuntu-22.04 steps: @@ -206,7 +206,7 @@ jobs: - build-linux - build-windows-32 - build-windows-64 - - build-mac +# - build-mac - export-protobuf-definitions if: startsWith(github.ref, 'refs/tags/v') steps: @@ -220,10 +220,10 @@ jobs: with: name: windows path: a2l_grpc - - uses: actions/download-artifact@v3 - with: - name: mac - path: a2l_grpc +# - uses: actions/download-artifact@v3 +# with: +# name: mac +# path: a2l_grpc - uses: actions/download-artifact@v3 with: name: protobuf From d16eb285d329659c903ef8701d6d0451093ffe34 Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Mon, 12 Feb 2024 07:26:57 +0100 Subject: [PATCH 04/10] update download-artifact version --- .github/workflows/build.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09e539f..c9f11f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,11 +30,11 @@ jobs: - generate-grpc-sources steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: antlr4 path: pkg/a2l/parser - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: grpc path: pkg/a2l @@ -48,11 +48,11 @@ jobs: - generate-grpc-sources steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: antlr4 path: pkg/a2l/parser - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: grpc path: pkg/a2l @@ -66,11 +66,11 @@ jobs: # - generate-grpc-sources # steps: # - uses: actions/checkout@v4 -# - uses: actions/download-artifact@v3 +# - uses: actions/download-artifact@v4 # with: # name: antlr4 # path: pkg/a2l/parser -# - uses: actions/download-artifact@v3 +# - uses: actions/download-artifact@v4 # with: # name: grpc # path: pkg/a2l @@ -90,11 +90,11 @@ jobs: # - test-mac steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: antlr4 path: pkg/a2l/parser - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: grpc path: pkg/a2l @@ -115,11 +115,11 @@ jobs: # - test-mac steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: antlr4 path: pkg/a2l/parser - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: grpc path: pkg/a2l @@ -167,11 +167,11 @@ jobs: # - test-mac # steps: # - uses: actions/checkout@v4 -# - uses: actions/download-artifact@v3 +# - uses: actions/download-artifact@v4 # with: # name: antlr4 # path: pkg/a2l/parser -# - uses: actions/download-artifact@v3 +# - uses: actions/download-artifact@v4 # with: # name: grpc # path: pkg/a2l @@ -212,19 +212,19 @@ jobs: steps: - uses: actions/checkout@v4 - run: mkdir a2l_grpc - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: linux path: a2l_grpc - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: windows path: a2l_grpc -# - uses: actions/download-artifact@v3 +# - uses: actions/download-artifact@v4 # with: # name: mac # path: a2l_grpc - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: protobuf path: a2l_grpc/protobuf From c9c2c33df2c0432aa467d2a556bd0f79b3b8566d Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Mon, 12 Feb 2024 07:27:52 +0100 Subject: [PATCH 05/10] fix build dependencies, try to build for 32 bits Windows --- .github/workflows/build.yml | 60 +++++++++++++++---------------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9f11f4..70ae959 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,8 +86,6 @@ jobs: runs-on: ubuntu-22.04 needs: - test-linux - - test-windows -# - test-mac steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 @@ -107,12 +105,26 @@ jobs: path: | *.so *.h - build-windows-32: + build-windows: runs-on: windows-2019 needs: - - test-linux - test-windows -# - test-mac + strategy: + matrix: + mingw: [ "MINGW32", "MINGW64" ] + include: +# - mingw: "MINGW32" +# package: "mingw-w64-i686" +# GOARCH: 386 + - mingw: "MINGW64" + package: "mingw-w64-x86_64" + GOARCH: amd64 + env: + MSYSTEM: ${{ matrix.mingw }} + CHERE_INVOKING: 1 + GOARCH: ${{ matrix.GOARCH }} + CGO_ENABLED: 1 + name: MSYS2 ${{ matrix.mingw }} steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 @@ -123,33 +135,12 @@ jobs: with: name: grpc path: pkg/a2l - - run: | - go get github.com/antlr4-go/antlr/v4 - $env:GOARCH=386 - $env:CGO_ENABLED=1 - go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go - - uses: actions/upload-artifact@v4 - with: - name: windows - path: | - *.dll - *.h - build-windows-64: - runs-on: windows-2019 - needs: - - test-linux - - test-windows -# - test-mac - steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 - with: - name: antlr4 - path: pkg/a2l/parser - - uses: actions/download-artifact@v3 - with: - name: grpc - path: pkg/a2l + - name: Set up shell + run: echo ::add-path::C:\msys64\usr\bin\ + shell: pwsh + - name: Print system version + run: | + uname - run: | go get github.com/antlr4-go/antlr/v4 go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go @@ -162,8 +153,6 @@ jobs: # build-mac: # runs-on: macos-latest-xlarge # needs: -# - test-linux -# - test-windows # - test-mac # steps: # - uses: actions/checkout@v4 @@ -204,8 +193,7 @@ jobs: contents: write needs: - build-linux - - build-windows-32 - - build-windows-64 + - build-windows # - build-mac - export-protobuf-definitions if: startsWith(github.ref, 'refs/tags/v') From 0d129f73a6594806744f15bef94fbe47efe727d5 Mon Sep 17 00:00:00 2001 From: lmbzib0 Date: Thu, 15 Feb 2024 13:52:33 +0100 Subject: [PATCH 06/10] compilation of 32bits ddl --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70ae959..14c85d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,11 +113,11 @@ jobs: matrix: mingw: [ "MINGW32", "MINGW64" ] include: -# - mingw: "MINGW32" -# package: "mingw-w64-i686" -# GOARCH: 386 + - mingw: "MINGW32" + path: "C:/msys64/mingw32/bin" + GOARCH: 386 - mingw: "MINGW64" - package: "mingw-w64-x86_64" + path: "C:/msys64/usr/bin" GOARCH: amd64 env: MSYSTEM: ${{ matrix.mingw }} @@ -135,15 +135,14 @@ jobs: with: name: grpc path: pkg/a2l - - name: Set up shell - run: echo ::add-path::C:\msys64\usr\bin\ - shell: pwsh - name: Print system version + shell: powershell run: | uname - - run: | + - shell: powershell + run: | go get github.com/antlr4-go/antlr/v4 - go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go + $env:PATH="${{ matrix.path }};$env:PATH" ;go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go - uses: actions/upload-artifact@v4 with: name: windows From 6c0e661b1c3a7205716e561f5067f06b10781485 Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Thu, 15 Feb 2024 13:57:52 +0100 Subject: [PATCH 07/10] run CI on PR events --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70ae959..85d9173 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: build -on: [push] +on: [push, pull_request] jobs: generate-antlr-sources: From a477f4c24269b5c80b3025a867658708a9e85168 Mon Sep 17 00:00:00 2001 From: lmbzib0 Date: Thu, 15 Feb 2024 14:17:47 +0100 Subject: [PATCH 08/10] fix artifact name --- .github/workflows/build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ab2278..d179d14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,10 +120,8 @@ jobs: path: "C:/msys64/usr/bin" GOARCH: amd64 env: - MSYSTEM: ${{ matrix.mingw }} - CHERE_INVOKING: 1 - GOARCH: ${{ matrix.GOARCH }} CGO_ENABLED: 1 + GOARCH: ${{ matrix.GOARCH }} name: MSYS2 ${{ matrix.mingw }} steps: - uses: actions/checkout@v4 @@ -142,10 +140,10 @@ jobs: - shell: powershell run: | go get github.com/antlr4-go/antlr/v4 - $env:PATH="${{ matrix.path }};$env:PATH" ;go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go + $env:PATH="${{ matrix.path }};$env:PATH" ;go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_${{ matrix.GOARCH }}.dll ./cmd/a2l/a2l.go - uses: actions/upload-artifact@v4 with: - name: windows + name: windows_${{ matrix.GOARCH }} path: | *.dll *.h From d34c601ee6f122bd530e0f7559b5a97c7677a70b Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Fri, 16 Feb 2024 08:03:13 +0100 Subject: [PATCH 09/10] Re-enable MacOS support, add Windows 32-bit artefacts --- .github/workflows/build.yml | 118 +++++++++++++++++++----------------- CHANGELOG.md | 3 + 2 files changed, 64 insertions(+), 57 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d179d14..87a3f74 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,29 +59,29 @@ jobs: - run: | go get github.com/antlr4-go/antlr/v4 go test ./cmd/a2l/... -# test-mac: -# runs-on: macos-latest-xlarge -# needs: -# - generate-antlr-sources -# - generate-grpc-sources -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/download-artifact@v4 -# with: -# name: antlr4 -# path: pkg/a2l/parser -# - uses: actions/download-artifact@v4 -# with: -# name: grpc -# path: pkg/a2l -# - name: Set up Go 1.21 -# uses: actions/setup-go@v4 -# with: -# go-version: "1.21" -# cache: true -# - run: | -# go get github.com/antlr4-go/antlr/v4 -# go test ./cmd/a2l/... + test-mac: + runs-on: macos-latest-xlarge + needs: + - generate-antlr-sources + - generate-grpc-sources + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: antlr4 + path: pkg/a2l/parser + - uses: actions/download-artifact@v4 + with: + name: grpc + path: pkg/a2l + - name: Set up Go 1.21 + uses: actions/setup-go@v4 + with: + go-version: "1.21" + cache: true + - run: | + go get github.com/antlr4-go/antlr/v4 + go test ./cmd/a2l/... build-linux: runs-on: ubuntu-22.04 needs: @@ -147,34 +147,34 @@ jobs: path: | *.dll *.h -# build-mac: -# runs-on: macos-latest-xlarge -# needs: -# - test-mac -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/download-artifact@v4 -# with: -# name: antlr4 -# path: pkg/a2l/parser -# - uses: actions/download-artifact@v4 -# with: -# name: grpc -# path: pkg/a2l -# - name: Set up Go 1.21 -# uses: actions/setup-go@v4 -# with: -# go-version: "1.21" -# cache: true -# - run: | -# go get github.com/antlr4-go/antlr/v4 -# go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dylib ./cmd/a2l/a2l.go -# - uses: actions/upload-artifact@v4 -# with: -# name: mac -# path: | -# *.dylib -# *.h + build-mac: + runs-on: macos-latest-xlarge + needs: + - test-mac + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: antlr4 + path: pkg/a2l/parser + - uses: actions/download-artifact@v4 + with: + name: grpc + path: pkg/a2l + - name: Set up Go 1.21 + uses: actions/setup-go@v4 + with: + go-version: "1.21" + cache: true + - run: | + go get github.com/antlr4-go/antlr/v4 + go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dylib ./cmd/a2l/a2l.go + - uses: actions/upload-artifact@v4 + with: + name: mac + path: | + *.dylib + *.h export-protobuf-definitions: runs-on: ubuntu-22.04 steps: @@ -191,7 +191,7 @@ jobs: needs: - build-linux - build-windows -# - build-mac + - build-mac - export-protobuf-definitions if: startsWith(github.ref, 'refs/tags/v') steps: @@ -203,12 +203,16 @@ jobs: path: a2l_grpc - uses: actions/download-artifact@v4 with: - name: windows + name: windows_386 + path: a2l_grpc + - uses: actions/download-artifact@v4 + with: + name: windows_amd64 + path: a2l_grpc + - uses: actions/download-artifact@v4 + with: + name: mac path: a2l_grpc -# - uses: actions/download-artifact@v4 -# with: -# name: mac -# path: a2l_grpc - uses: actions/download-artifact@v4 with: name: protobuf diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..ddbd008 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,3 @@ +# Change log + +- Add support for 32-bit Windows OS. From 3e53115e7ac36490df33f61b2d6045d0c6593b39 Mon Sep 17 00:00:00 2001 From: lmbsog0 Date: Fri, 16 Feb 2024 08:06:13 +0100 Subject: [PATCH 10/10] fix deprecated action version --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87a3f74..82a0b36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: name: grpc path: pkg/a2l - name: Set up Go 1.21 - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: "1.21" cache: true @@ -162,7 +162,7 @@ jobs: name: grpc path: pkg/a2l - name: Set up Go 1.21 - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: "1.21" cache: true