summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-03-10 18:23:01 -0600
committermo khan <mo@mokhan.ca>2025-03-10 18:23:01 -0600
commit2a9b689a0775a2ce831dc08c73fc0959fe3f9e83 (patch)
tree82ee40ba802b7eb3ab5709bdee1ac2c5f7aee1e1
parent9a865953c4a95137faa336ca1d228d3ab2bc305f (diff)
chore: install mage using go tool
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--.tool-versions1
-rw-r--r--Makefile4
-rw-r--r--go.mod7
-rw-r--r--go.sum2
-rw-r--r--magefile.go4
6 files changed, 14 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d342a72..b146d80b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
test:
- image: alpine:latest
+ image: golang:1.24-alpine
script:
- - apk add --no-cache bash build-base git libffi make mise openssl-dev ruby ruby-bundler ruby-dev yaml-dev zlib-dev
+ - apk add --no-cache bash build-base firefox chromium git go make openssl-dev ruby ruby-bundler ruby-dev
- make
- - bash
- - eval "$(mise activate bash)"
- - mage test
diff --git a/.tool-versions b/.tool-versions
index 0b12ebc0..954cfe16 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,3 @@
golang 1.24.0
-mage 1.15.0
protoc 3.19.6
ruby 3.4.2
diff --git a/Makefile b/Makefile
index 9dd63b15..66a8baa0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
default:
- @mise install
- @eval "$(mise activate bash)"
@go install tool
@command -v protoc-gen-twirp_ruby
+ @command -v mage
+ @command -v playwright
@mage -l
diff --git a/go.mod b/go.mod
index 1d8ab7ab..4849306a 100644
--- a/go.mod
+++ b/go.mod
@@ -8,6 +8,7 @@ require (
github.com/playwright-community/playwright-go v0.5001.0
github.com/stretchr/testify v1.8.4
github.com/xlgmokha/x v0.0.0-20240605230110-5cbcac4d8ff8
+ golang.org/x/oauth2 v0.28.0
)
require (
@@ -28,4 +29,8 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
-tool github.com/arthurnn/twirp-ruby/protoc-gen-twirp_ruby
+tool (
+ github.com/arthurnn/twirp-ruby/protoc-gen-twirp_ruby
+ github.com/magefile/mage
+ github.com/playwright-community/playwright-go/cmd/playwright
+)
diff --git a/go.sum b/go.sum
index 6cc9a573..1e26af35 100644
--- a/go.sum
+++ b/go.sum
@@ -60,6 +60,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
+golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/magefile.go b/magefile.go
index 52dddeaa..92d071da 100644
--- a/magefile.go
+++ b/magefile.go
@@ -15,7 +15,7 @@ import (
// Default target to run when none is specified
// If not set, running mage will list available targets
-var Default = Run
+var Default = Servers
// Run the Identity Provider
func Idp() error {
@@ -85,7 +85,7 @@ func Protos() error {
}
// Run All the servers
-func Run(ctx context.Context) {
+func Servers(ctx context.Context) {
mg.CtxDeps(ctx, Idp, UI, Api, Gateway)
}