From 06d31f0e66a5cee72e5cf0815354aadf482c602f Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 12 Jul 2024 19:06:34 +0300 Subject: [PATCH] Remove macOS amd64 builds and update go-sqlite3 --- .gitlab-ci.yml | 18 ------------------ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d8ea06..0cbdba3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,24 +45,6 @@ windows/amd64: paths: - gomuks.exe -macos/amd64: - stage: build - tags: - - macos - - amd64 - before_script: - - export GO_LDFLAGS="-X main.Tag=$CI_COMMIT_TAG -X main.Commit=$CI_COMMIT_SHA -X 'main.BuildTime=`date '+%b %_d %Y, %H:%M:%S'`'" - script: - - mkdir gomuks-macos-amd64 - - go build -ldflags "$GO_LDFLAGS" -o gomuks-macos-amd64/gomuks - - install_name_tool -change /usr/local/opt/libolm/lib/libolm.3.dylib @rpath/libolm.3.dylib gomuks-macos-amd64/gomuks - - install_name_tool -add_rpath @executable_path gomuks-macos-amd64/gomuks - - install_name_tool -add_rpath /usr/local/opt/libolm/lib gomuks-macos-amd64/gomuks - - cp /usr/local/opt/libolm/lib/libolm.3.dylib gomuks-macos-amd64/ - artifacts: - paths: - - gomuks-macos-amd64 - macos/arm64: stage: build tags: diff --git a/go.mod b/go.mod index 7658d36..6e92541 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/lithammer/fuzzysearch v1.1.5 github.com/lucasb-eyer/go-colorful v1.2.0 github.com/mattn/go-runewidth v0.0.14 - github.com/mattn/go-sqlite3 v1.14.16 + github.com/mattn/go-sqlite3 v1.14.22 github.com/rivo/uniseg v0.4.2 github.com/sasha-s/go-deadlock v0.3.1 github.com/yuin/goldmark v1.5.3 diff --git a/go.sum b/go.sum index 5292530..f96e648 100644 --- a/go.sum +++ b/go.sum @@ -26,8 +26,8 @@ github.com/lithammer/fuzzysearch v1.1.5 h1:Ag7aKU08wp0R9QCfF4GoGST9HbmAIeLP7xwMr github.com/lithammer/fuzzysearch v1.1.5/go.mod h1:1R1LRNk7yKid1BaQkmuLQaHruxcC4HmAH30Dh61Ih1Q= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= -github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= -github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=