Skip to content

Commit

Permalink
Hopefully this fixed the build tasks again
Browse files Browse the repository at this point in the history
I fucking hate this :D
  • Loading branch information
Bios-Marcel committed Oct 21, 2024
1 parent d2e8390 commit f157884
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/docker-image-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ jobs:
max-parallel: 3
matrix:
os: [ubuntu-latest, windows-2022]
buildArgs: VERSION=${{ github.ref_name }}
include:
- os: ubuntu-latest
platforms: linux/amd64,linux/arm/v7,linux/arm64
file: linux.Dockerfile
buildArgs: VERSION=${{ github.event.workflow_run.head_branch }}
tags: latest, ${{ github.event.workflow_run.head_branch }}
multiPlatform: true

- os: windows-2022
platforms: windows/amd64
file: windows.Dockerfile
buildArgs: VERSION=${{ github.event.workflow_run.head_branch }}
tags: windows-latest, windows-${{ github.event.workflow_run.head_branch }}
multiPlatform: false

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
# Workaround to get tags, getting git describe to work.
fetch-depth: 0

- name: Install Go
uses: actions/setup-go@v5
Expand All @@ -38,7 +41,7 @@ jobs:
# anymore, but I have had issues with this in the past) :D
CGO_ENABLED: 0
run: |
go build -trimpath -ldflags "-w -s -X 'github.com/scribble-rs/scribble.rs/internal/version.Version=$VERSION'" -o ${{ matrix.binary_name }} ./cmd/scribblers
go build -trimpath -ldflags "-w -s -X 'github.com/scribble-rs/scribble.rs/internal/version.Version=$(git describe --tags --dirty)'" -o ${{ matrix.binary_name }} ./cmd/scribblers
- name: Upload build artifact
uses: actions/upload-artifact@v4
Expand Down

0 comments on commit f157884

Please sign in to comment.