ci: run go generate in ci and dockerfile

JM-Lemmi · Feb 14, 2024 · efd1507 · efd1507
1 parent b10c83d
commit efd1507
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/.github/scripts/generate-version.sh b/.github/scripts/generate-version.sh
@@ -3,10 +3,10 @@ DIR="$(cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 cd "$DIR" || exit 1
 
 if [[ $(git tag -l --contains HEAD) ]]; then
-    echo -n $(git tag -l --contains HEAD) > ../.././cmd/ical-relay/VERSION
+    echo -n $(git tag -l --contains HEAD) > ../../cmd/ical-relay/VERSION
 else
-    echo -n $(git rev-parse --short HEAD) > ../.././cmd/ical-relay/VERSION
+    echo -n $(git rev-parse --short HEAD) > ../../cmd/ical-relay/VERSION
 fi
 if ! git diff --quiet; then
-    echo -n "-dirty" >> ../.././cmd/ical-relay/VERSION
+    echo -n "-dirty" >> ../../cmd/ical-relay/VERSION
 fi
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -11,10 +11,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: ./.github/scripts/generate-version.sh
       - uses: actions/setup-go@v4
         with:
           go-version: '1.18.0' # The Go version to download (if necessary) and use.
+      - run: go generate cmd/ical-relay/main.go
       - run: go build -o ./bin/ical-relay ./cmd/ical-relay/
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -52,10 +52,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: ./.github/scripts/generate-version.sh
       - uses: actions/setup-go@v4
         with:
           go-version: '1.18.0' # The Go version to download (if necessary) and use.
+      - run: go generate cmd/ical-relay/main.go
       - run: go build -o ./bin/ical-relay ./cmd/ical-relay/ && strip ./bin/ical-relay
       - uses: actions/upload-artifact@v3
         with:
@@ -70,7 +70,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: ./.github/scripts/generate-version.sh
       - name: Create debpkg structure
         run: |
           mkdir -p cmd/ical-relay/.debpkg/etc/ical-relay

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,12 +13,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: ./.github/scripts/generate-version.sh
 
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: 1.19
+      - run: go generate cmd/ical-relay/main.go
 
       - name: Run tests
         run: go test ./cmd/ical-relay/...
diff --git a/cmd/ical-relay/Dockerfile b/cmd/ical-relay/Dockerfile
@@ -1,12 +1,11 @@
 FROM golang:alpine AS build
 
-RUN apk --update add git
+RUN apk --update add git bash
 
 WORKDIR /app
 COPY . /app
 
-RUN if [[ $(git tag -l --contains HEAD) ]]; then echo -n $(git tag -l --contains HEAD) > ./cmd/ical-relay/VERSION; else echo -n $(git rev-parse --short HEAD) > ./cmd/ical-relay/VERSION; fi
-
+RUN go generate ./cmd/ical-relay/
 RUN go build -o ./cmd/ical-relay/ical-relay ./cmd/ical-relay/
 
 FROM alpine AS run