Compare commits

...

6 Commits

Author SHA1 Message Date
Neale Pickett 60fdb0ddd8 Include moth-devel.bat in win artifacts 2023-12-06 17:22:45 -07:00
Neale Pickett cc0e5bba94 actually build it 2023-12-06 17:17:47 -07:00
Neale Pickett 535276446c Possibly smarter winbuild 2023-12-06 17:13:21 -07:00
Neale Pickett 7418a3c224 More CI work 2023-12-06 16:51:39 -07:00
Neale Pickett 05ed4f315c winbuild work? 2023-12-06 16:49:02 -07:00
Neale Pickett fa049db1a2 Windows executables from CI/CD? 2023-12-06 16:44:40 -07:00
7 changed files with 74 additions and 15 deletions

3
.gitignore vendored
View File

@ -5,4 +5,5 @@
__debug_bin
*.tar.gz
transpile
mothd
mothd
winmoth.*.zip

View File

@ -1,5 +1,6 @@
stages:
- test
- build
- push
Run unit tests:
@ -37,6 +38,19 @@ Generage coverage XML:
coverage_format: cobertura
path: coverage.xml
winbuild:
stage: build
image: *goimage
needs: ["Run unit tests"]
script:
- GOOS=windows GOARCH=amd64 go build ./cmd/mothd
- cp build/package/moth-devel.bat .
artifacts:
paths:
- mothd.exe
- moth-devel.bat
- theme/*
push:
stage: push
needs: ["Run unit tests"]

View File

@ -1,4 +1,5 @@
FROM golang:1 AS builder
ARG GO_VERSION=1.21-alpine
FROM docker.io/library/golang:${GO_VERSION} AS builder
COPY go.* /src/
COPY pkg /src/pkg/
COPY cmd /src/cmd/

View File

@ -2,19 +2,34 @@
set -e
cd $(dirname $0)/../..
cd $(dirname $0)
base=../..
PODMAN=$(command -v podman || echo docker)
VERSION=$(cat CHANGELOG.md | awk -F '[][]' '/^## \[/ {print $2; exit}')
VERSION=$(cat $base/CHANGELOG.md | awk -F '[][]' '/^## \[/ {print $2; exit}')
GO_VERSION=$(cat $base/go.mod | sed -n 's/^go //p')
for target in moth; do
tag=dirtbags/$target:$VERSION
echo "==== Building $tag"
$PODMAN build \
--build-arg http_proxy --build-arg https_proxy --build-arg no_proxy \
--tag $tag \
--target $target \
-f build/package/Containerfile .
done
(
zipfile=winmoth.$VERSION.zip
echo "=== Building $zipfile"
mkdir -p winmoth winmoth/state winmoth/puzzles winmoth/mothballs
echo devel > winmoth/state/teamids.txt
cp moth-devel.bat winmoth
cp -a $base/theme winmoth
(
cd winmoth
GOOS=windows GOARCH=amd64 go build ../$base/cmd/mothd/...
)
zip -r $zipfile winmoth
rm -rf winmoth
)
tag=dirtbags/moth:$VERSION
echo "==== Building $tag"
docker build \
--build-arg GO_VERSION=$GO_VERSION \
--build-arg http_proxy --build-arg https_proxy --build-arg no_proxy \
--tag $tag \
-f Containerfile $base
exit 0

View File

@ -0,0 +1,4 @@
mkdir state
mkdir puzzles
echo devel > state/teamids.txt
.\mothd.exe -puzzles puzzles

24
build/package/winbuild.sh Executable file
View File

@ -0,0 +1,24 @@
#! /bin/sh
set -e
cd $(dirname $0)
base=../..
VERSION=$(cat $base/CHANGELOG.md | awk -F '[][]' '/^## \[/ {print $2; exit}')
(
zipfile=winmoth.$VERSION.zip
echo "=== Building $zipfile"
mkdir -p winmoth winmoth/state winmoth/puzzles winmoth/mothballs
echo devel > winmoth/state/teamids.txt
cp moth-devel.bat winmoth
cp -a $base/theme winmoth
(
cd winmoth
GOOS=windows GOARCH=amd64 go build ../$base/cmd/mothd/...
)
zip -r $zipfile winmoth
rm -rf winmoth
)

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/dirtbags/moth/v4
go 1.13
go 1.21
require (
github.com/kr/text v0.2.0 // indirect