Skip to content

Commit 9bda57a

Browse files
mostafamostafa
authored
Merge pull request #69 from gatewayd-io/add-windows-support
Add windows support
2 parents 81fb229 + 3498a30 commit 9bda57a

File tree

6 files changed

+69
-81
lines changed

6 files changed

+69
-81
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
matrix:
16-
# Windows build is disabled due to the following issue:
17-
# https://github.com/gatewayd-io/gatewayd-plugin-cache/issues/58
18-
os: [ubuntu-latest, macos-latest] #, windows-latest]
16+
os: [ubuntu-latest, macos-latest, windows-latest]
1917
steps:
2018
- name: Checkout code
2119
uses: actions/checkout@v3
@@ -37,24 +35,24 @@ jobs:
3735
elif [ "$RUNNER_OS" == "macOS" ]; then
3836
make build-release-darwin
3937
fi
40-
# - name: Build and release binaries
41-
# if: matrix.os == 'windows-latest'
42-
# run: |
43-
# make build-release-windows
38+
- name: Build and release binaries
39+
if: matrix.os == 'windows-latest'
40+
run: |
41+
make build-release-windows
4442
- name: Upload binaries and checksums
4543
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
4644
uses: actions/upload-artifact@v3
4745
with:
4846
path: dist/*.tar.gz
4947
name: dist-${{ matrix.os }}
5048
if-no-files-found: warn
51-
# - name: Upload binaries and checksums
52-
# if: matrix.os == 'windows-latest'
53-
# uses: actions/upload-artifact@v3
54-
# with:
55-
# path: dist/*.zip
56-
# name: dist-${{ matrix.os }}
57-
# if-no-files-found: warn
49+
- name: Upload binaries and checksums
50+
if: matrix.os == 'windows-latest'
51+
uses: actions/upload-artifact@v3
52+
with:
53+
path: dist/*.zip
54+
name: dist-${{ matrix.os }}
55+
if-no-files-found: warn
5856
release:
5957
needs: build
6058
runs-on: ubuntu-latest
@@ -63,10 +61,10 @@ jobs:
6361
uses: actions/checkout@v3
6462
with:
6563
fetch-depth: 0
66-
# - name: Download binaries and checksums for Windows
67-
# uses: actions/download-artifact@v3
68-
# with:
69-
# name: dist-windows-latest
64+
- name: Download binaries and checksums for Windows
65+
uses: actions/download-artifact@v3
66+
with:
67+
name: dist-windows-latest
7068
- name: Download binaries and checksums for Linux
7169
uses: actions/download-artifact@v3
7270
with:
@@ -83,7 +81,7 @@ jobs:
8381
files: |
8482
*.tar.gz
8583
checksums.txt
86-
# *.zip
84+
*.zip
8785
draft: false
8886
prerelease: false
8987
tag_name: ${{ github.ref_name }}

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ update-all:
2020
@go get -u ./...
2121

2222
build-dev: tidy
23-
@go build
23+
@CGO_ENABLED=0 go build
2424

2525
create-build-dir:
2626
@mkdir -p dist
@@ -29,7 +29,7 @@ build-linux-amd64: tidy
2929
@echo "Building gatewayd ${VERSION} for linux-amd64"
3030
@mkdir -p dist/linux-amd64
3131
@cp README.md LICENSE gatewayd_plugin.yaml ./dist/linux-amd64/
32-
@GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/linux-amd64/gatewayd-plugin-cache
32+
@GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/linux-amd64/gatewayd-plugin-cache
3333
@sha256sum dist/linux-amd64/gatewayd-plugin-cache | sed 's/dist\/linux-amd64\///g' >> dist/linux-amd64/checksum.txt
3434
@tar czf dist/gatewayd-plugin-cache-linux-amd64-${VERSION}.tar.gz -C ./dist/linux-amd64/ ${FILES}
3535
@sha256sum dist/gatewayd-plugin-cache-linux-amd64-${VERSION}.tar.gz | sed 's/dist\///g' >> dist/checksums.txt
@@ -38,7 +38,7 @@ build-linux-arm64:
3838
@echo "Building gatewayd ${VERSION} for linux-arm64"
3939
@mkdir -p dist/linux-arm64
4040
@cp README.md LICENSE gatewayd_plugin.yaml ./dist/linux-arm64/
41-
@GOOS=linux GOARCH=arm64 CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/linux-arm64/gatewayd-plugin-cache
41+
@GOOS=linux GOARCH=arm64 CGO_ENABLED=0 CC=aarch64-linux-gnu-gcc go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/linux-arm64/gatewayd-plugin-cache
4242
@sha256sum dist/linux-arm64/gatewayd-plugin-cache | sed 's/dist\/linux-arm64\///g' >> dist/linux-arm64/checksum.txt
4343
@tar czf dist/gatewayd-plugin-cache-linux-arm64-${VERSION}.tar.gz -C ./dist/linux-arm64/ ${FILES}
4444
@sha256sum dist/gatewayd-plugin-cache-linux-arm64-${VERSION}.tar.gz | sed 's/dist\///g' >> dist/checksums.txt
@@ -47,7 +47,7 @@ build-darwin-amd64:
4747
@echo "Building gatewayd ${VERSION} for darwin-arm64"
4848
@mkdir -p dist/darwin-amd64
4949
@cp README.md LICENSE gatewayd_plugin.yaml ./dist/darwin-amd64/
50-
@GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/darwin-amd64/gatewayd-plugin-cache
50+
@GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/darwin-amd64/gatewayd-plugin-cache
5151
@shasum -a 256 dist/darwin-amd64/gatewayd-plugin-cache | sed 's/dist\/darwin-amd64\///g' >> dist/darwin-amd64/checksum.txt
5252
@tar czf dist/gatewayd-plugin-cache-darwin-amd64-${VERSION}.tar.gz -C ./dist/darwin-amd64/ ${FILES}
5353
@shasum -a 256 dist/gatewayd-plugin-cache-darwin-amd64-${VERSION}.tar.gz | sed 's/dist\///g' >> dist/checksums.txt
@@ -56,7 +56,7 @@ build-darwin-arm64:
5656
@echo "Building gatewayd ${VERSION} for darwin-arm64"
5757
@mkdir -p dist/darwin-arm64
5858
@cp README.md LICENSE gatewayd_plugin.yaml ./dist/darwin-arm64/
59-
@GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/darwin-arm64/gatewayd-plugin-cache
59+
@GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/darwin-arm64/gatewayd-plugin-cache
6060
@shasum -a 256 dist/darwin-arm64/gatewayd-plugin-cache | sed 's/dist\/darwin-arm64\///g' >> dist/darwin-arm64/checksum.txt
6161
@tar czf dist/gatewayd-plugin-cache-darwin-arm64-${VERSION}.tar.gz -C ./dist/darwin-arm64/ ${FILES}
6262
@shasum -a 256 dist/gatewayd-plugin-cache-darwin-arm64-${VERSION}.tar.gz | sed 's/dist\///g' >> dist/checksums.txt
@@ -65,18 +65,18 @@ build-windows-amd64:
6565
@echo "Building gatewayd ${VERSION} for windows-amd64"
6666
@mkdir -p dist/windows-amd64
6767
@cp README.md LICENSE gatewayd_plugin.yaml ./dist/windows-amd64/
68-
@GOOS=windows GOARCH=amd64 CGO_ENABLED=1 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/windows-amd64/gatewayd-plugin-cache.exe
68+
@GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/windows-amd64/gatewayd-plugin-cache.exe
6969
@sha256sum dist/windows-amd64/gatewayd-plugin-cache.exe | sed 's/dist\/windows-amd64\///g' >> dist/windows-amd64/checksum.txt
70-
@zip -r dist/gatewayd-plugin-cache-windows-amd64-${VERSION}.zip -j ./dist/windows-amd64/ ${FILES}
70+
@zip -r dist/gatewayd-plugin-cache-windows-amd64-${VERSION}.zip -j ./dist/windows-amd64/
7171
@sha256sum dist/gatewayd-plugin-cache-windows-amd64-${VERSION}.zip | sed 's/dist\///g' >> dist/checksums.txt
7272

7373
build-windows-arm64:
7474
@echo "Building gatewayd ${VERSION} for windows-arm64"
7575
@mkdir -p dist/windows-arm64
7676
@cp README.md LICENSE gatewayd_plugin.yaml ./dist/windows-arm64/
77-
@GOOS=windows GOARCH=arm64 CGO_ENABLED=1 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/windows-arm64/gatewayd-plugin-cache.exe
77+
@GOOS=windows GOARCH=arm64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w ${EXTRA_LDFLAGS}" -o dist/windows-arm64/gatewayd-plugin-cache.exe
7878
@sha256sum dist/windows-arm64/gatewayd-plugin-cache.exe | sed 's/dist\/windows-arm64\///g' >> dist/windows-arm64/checksum.txt
79-
@zip -r dist/gatewayd-plugin-cache-windows-arm64-${VERSION}.zip -j ./dist/windows-arm64/ ${FILES}
79+
@zip -r dist/gatewayd-plugin-cache-windows-arm64-${VERSION}.zip -j ./dist/windows-arm64/
8080
@sha256sum dist/gatewayd-plugin-cache-windows-arm64-${VERSION}.zip | sed 's/dist\///g' >> dist/checksums.txt
8181

8282
build-release-linux: tidy create-build-dir build-linux-amd64 build-linux-arm64

‎go.mod‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.20
44

55
require (
66
github.com/alicebob/miniredis/v2 v2.30.5
7-
github.com/gatewayd-io/gatewayd-plugin-sdk v0.1.6
7+
github.com/gatewayd-io/gatewayd-plugin-sdk v0.1.8
88
github.com/getsentry/sentry-go v0.25.0
9-
github.com/go-co-op/gocron v1.35.2
9+
github.com/go-co-op/gocron v1.36.0
1010
github.com/go-redis/redis/v8 v8.11.5
1111
github.com/hashicorp/go-hclog v1.5.0
12-
github.com/hashicorp/go-plugin v1.5.2
12+
github.com/hashicorp/go-plugin v1.6.0
1313
github.com/jackc/pgx/v5 v5.5.0
1414
github.com/prometheus/client_golang v1.17.0
15-
github.com/spf13/cast v1.5.1
15+
github.com/spf13/cast v1.6.0
1616
github.com/stretchr/testify v1.8.4
1717
github.com/zenizh/go-capturer v0.0.0-20211219060012-52ea6c8fed04
1818
google.golang.org/grpc v1.59.0
@@ -24,27 +24,29 @@ require (
2424
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2525
github.com/davecgh/go-spew v1.1.1 // indirect
2626
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
27-
github.com/fatih/color v1.15.0 // indirect
27+
github.com/fatih/color v1.16.0 // indirect
2828
github.com/golang/protobuf v1.5.3 // indirect
29-
github.com/google/uuid v1.3.1 // indirect
29+
github.com/google/uuid v1.4.0 // indirect
3030
github.com/hashicorp/yamux v0.1.1 // indirect
3131
github.com/mattn/go-colorable v0.1.13 // indirect
3232
github.com/mattn/go-isatty v0.0.20 // indirect
3333
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
3434
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
3535
github.com/oklog/run v1.1.0 // indirect
36-
github.com/pganalyze/pg_query_go/v4 v4.2.3 // indirect
36+
github.com/pganalyze/pg_query_go/v4 v4.2.4-0.20231202022636-3c8cb1bd9d99 // indirect
3737
github.com/pmezard/go-difflib v1.0.0 // indirect
3838
github.com/prometheus/client_model v0.5.0 // indirect
3939
github.com/prometheus/common v0.45.0 // indirect
4040
github.com/prometheus/procfs v0.12.0 // indirect
4141
github.com/robfig/cron/v3 v3.0.1 // indirect
42+
github.com/wasilibs/go-pgquery v0.0.0-20231202122549-dbe58a6cd4c4 // indirect
43+
github.com/wasilibs/wazerox v0.0.0-20231117065139-b3503f4aeff6 // indirect
4244
github.com/yuin/gopher-lua v1.1.0 // indirect
4345
go.uber.org/atomic v1.11.0 // indirect
44-
golang.org/x/net v0.17.0 // indirect
45-
golang.org/x/sys v0.14.0 // indirect
46+
golang.org/x/net v0.19.0 // indirect
47+
golang.org/x/sys v0.15.0 // indirect
4648
golang.org/x/text v0.14.0 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
49+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
4850
google.golang.org/protobuf v1.31.0 // indirect
4951
gopkg.in/yaml.v3 v3.0.1 // indirect
5052
)

0 commit comments

Comments
 (0)