Skip to content

Commit 553c291

Browse files
authored
fix(workflows): Minor fixes affecting release pipelines (#2187)
Reviewed-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io> Approved-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
2 parents 2456589 + 3119c61 commit 553c291

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

.github/workflows/buildenvs.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@ jobs:
207207
- uses: actions/checkout@v4
208208
if: ${{ steps.check-run.outputs.run == 'true' && github.event_name != 'push' }}
209209

210+
- name: Fetch all tags
211+
run: |
212+
git config --global --add safe.directory /__w/kraftkit/kraftkit
213+
git fetch --force --tags
214+
210215
- name: Set up QEMU
211216
if: ${{ steps.check-run.outputs.run == 'true' }}
212217
uses: docker/setup-qemu-action@v3
@@ -237,6 +242,7 @@ jobs:
237242
cache-from: type=gha
238243
cache-to: type=gha,mode=max
239244
outputs: type=docker,dest=/tmp/myself.tar
245+
context: .
240246
env:
241247
IMAGE_TAG: blahblahblah
242248

@@ -491,6 +497,11 @@ jobs:
491497
- uses: actions/checkout@v4
492498
if: ${{ steps.check-run.outputs.run == 'true' && github.event_name != 'push' }}
493499

500+
- name: Fetch all tags
501+
run: |
502+
git config --global --add safe.directory /__w/kraftkit/kraftkit
503+
git fetch --force --tags
504+
494505
- name: Set up QEMU
495506
if: ${{ steps.check-run.outputs.run == 'true' }}
496507
uses: docker/setup-qemu-action@v3
@@ -539,6 +550,7 @@ jobs:
539550
file: ./buildenvs/github-action.Dockerfile
540551
secrets: |
541552
GIT_AUTH_TOKEN=${{ secrets.GITHUB_TOKEN }}
553+
context: .
542554
env:
543555
KRAFTKIT_VERSION: blahblahblah
544556

.github/workflows/release-stable.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
apt-get update
3131
apt-get install -y --no-install-recommends \
3232
fury-cli \
33-
nix-bin
33+
nix-bin \
34+
openssh-client;
3435
curl -O -L "https://github.com/sigstore/cosign/releases/latest/download/cosign-linux-amd64"
3536
mv cosign-linux-amd64 /usr/local/bin/cosign
3637
chmod +x /usr/local/bin/cosign

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ endif
3636
ifeq ($(HASH),)
3737
HASH_COMMIT ?= HEAD
3838
HASH ?= $(shell git update-index -q --refresh && \
39-
git describe --tags)
39+
git describe --tags --always)
4040
# Others can't be dirty by definition
4141
ifneq ($(HASH_COMMIT),HEAD)
4242
HASH_COMMIT ?= HEAD

0 commit comments

Comments
 (0)