From 13a62555535c08b16de01336643f95ae5923c124 Mon Sep 17 00:00:00 2001 From: wispem-wantex Date: Sat, 10 Jan 2026 13:51:26 -0800 Subject: [PATCH] ci: use devcontainer build script in CI. Also re-tag it as 'gas' instead of 'gas/ci' (which should be redundant) --- .gitea/workflows/CI.yaml | 10 +++++----- pkg/codegen/modelgenerate/generate_model.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/CI.yaml b/.gitea/workflows/CI.yaml index e6a2cd9..bb7bcbf 100644 --- a/.gitea/workflows/CI.yaml +++ b/.gitea/workflows/CI.yaml @@ -3,14 +3,14 @@ name: CI on: [push] jobs: - # These steps build the `gas/ci` docker image. + # These steps build the `gas` docker image. # There's a tricky bootstrapping problem here. We'll try to cheat first, and if that doesn't # work, then we'll do a full bootstrapping build starting from Alpine and installing `gocheckout` # first thing. build-docker: continue-on-error: true container: - image: gas/ci + image: gas volumes: - woodpecker-gocache:/go-cache-volume env: @@ -23,7 +23,7 @@ jobs: run: gocheckout - name: build CI container - run: docker build -t gas/ci ops/devcontainer + run: ops/devcontainer/build.sh # Fallback: full bootstrap build. This one is quite slow. build-docker-bootstrap: @@ -51,13 +51,13 @@ jobs: run: apk add docker - name: build CI container - run: docker build -t gas/ci ops/devcontainer + run: ops/devcontainer/build.sh release-test: needs: build-docker-bootstrap if: "!failure()" container: - image: gas/ci + image: gas volumes: - woodpecker-gocache:/go-cache-volume env: diff --git a/pkg/codegen/modelgenerate/generate_model.go b/pkg/codegen/modelgenerate/generate_model.go index 4ec590f..d0190cc 100644 --- a/pkg/codegen/modelgenerate/generate_model.go +++ b/pkg/codegen/modelgenerate/generate_model.go @@ -12,10 +12,10 @@ import ( ) func GenerateIDType(table schema.Table) *ast.GenDecl { - // e.g., `type FoodID uint64` + // e.g., `type FoodID int` return &ast.GenDecl{ Tok: token.TYPE, - Specs: []ast.Spec{&ast.TypeSpec{Name: ast.NewIdent(table.TypeIDName), Type: ast.NewIdent("uint64")}}, + Specs: []ast.Spec{&ast.TypeSpec{Name: ast.NewIdent(table.TypeIDName), Type: ast.NewIdent("int")}}, } }