From 4a7876313be2d015f68cb8ac85dcad4b490de46a Mon Sep 17 00:00:00 2001 From: Gapodo Date: Wed, 7 Dec 2022 22:10:38 +0100 Subject: [PATCH] fixed? --- .woodpecker/release-version.yml | 8 ++------ Dockerfile.ci | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.woodpecker/release-version.yml b/.woodpecker/release-version.yml index b3bd2b3c38..3ddb8988f1 100644 --- a/.woodpecker/release-version.yml +++ b/.woodpecker/release-version.yml @@ -97,21 +97,17 @@ pipeline: image: *golang_image pull: true commands: - - pwd - - ls -la / - mkdir -p /source/dist/release - touch /source/dist/release/forgejo-${CI_COMMIT_TAG##v}-linux-arm64 - touch /source/dist/release/forgejo-${CI_COMMIT_TAG##v}-linux-amd64 - - ls -la ./dist/* + - mkdir tmp-bin + - cp -r dist/release/* tmp-bin/ build-docker: image: *buildx_plugin_image pull: true settings: - context: '/source' - debug: 'true' dockerfile: Dockerfile.ci - no_cache: 'true' platforms: *docker_platforms registry: from_secret: domain diff --git a/Dockerfile.ci b/Dockerfile.ci index 4d22053c04..ddf3236be9 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -24,8 +24,8 @@ RUN test -n "$CI_COMMIT_SHA" || (echo "CI_COMMIT_SHA is required but not set" >& mkdir -p "${DR}" # Copying the arch specific binaries to the path easily accessible in the next step and rename them to gitea -COPY --chmod=755 ./dist/release/forgejo-$TAG-linux-amd64 "${OUT}/linux/amd64/gitea" -COPY --chmod=755 ./dist/release/forgejo-$TAG-linux-arm64 "${OUT}/linux/arm64/gitea" +COPY --chmod=755 tmp-bin/release/forgejo-$TAG-linux-amd64 "${OUT}/linux/amd64/gitea" +COPY --chmod=755 tmp-bin/release/forgejo-$TAG-linux-arm64 "${OUT}/linux/arm64/gitea" WORKDIR /build