From 78456593222026a892896204ba0e7a4e0d0e84e7 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 17 Oct 2024 06:14:31 +0200 Subject: [PATCH] forgejo-cli is now a symlink and cannot be used for sanity checks It could be used but then `cp --dereference` would need to be used instead in the forgejo-build-publish action. + docker cp forgejo-amd64:/app/gitea/forgejo-cli forgejo-9.0-test-linux-amd64 + chmod +x forgejo-9.0-test-linux-amd64 chmod: cannot operate on dangling symlink 'forgejo-9.0-test-linux-amd64' (cherry picked from commit 1a7a9055e4fa0024810cf1a7f7cfc77a7b5e7532) --- .forgejo/testdata/build-release/Dockerfile | 2 +- .forgejo/workflows/build-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/testdata/build-release/Dockerfile b/.forgejo/testdata/build-release/Dockerfile index 9c44dedddd..4ef67d34e0 100644 --- a/.forgejo/testdata/build-release/Dockerfile +++ b/.forgejo/testdata/build-release/Dockerfile @@ -3,4 +3,4 @@ ARG RELEASE_VERSION=unkown LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.version="${RELEASE_VERSION}" RUN mkdir -p /app/gitea -RUN ( echo '#!/bin/sh' ; echo "echo forgejo v$RELEASE_VERSION" ) > /app/gitea/forgejo-cli ; chmod +x /app/gitea/forgejo-cli +RUN ( echo '#!/bin/sh' ; echo "echo forgejo v$RELEASE_VERSION" ) > /app/gitea/gitea ; chmod +x /app/gitea/gitea diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index a132242ad0..5c6443f540 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -170,7 +170,7 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v6 release-notes: "${{ steps.release-notes.outputs.value }}" binary-name: forgejo - binary-path: /app/gitea/forgejo-cli + binary-path: /app/gitea/gitea override: "${{ steps.release-info.outputs.override }}" verify-labels: "maintainer=contact@forgejo.org,org.opencontainers.image.version=${{ steps.release-info.outputs.version }}" verbose: ${{ vars.VERBOSE || secrets.VERBOSE || 'false' }}