From 03efa900ea066ee87a135698a6fbcce51ded8d12 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 16 Feb 2024 20:21:18 +0100 Subject: [PATCH 1/2] [RELEASE] build test releases * forgejo & v*/forgejo branches are mirrored to the forgejo-integration repository on every commit * re-build a test release every time that happens * forogejo => vforgejo-test * v1.21/forgejo => v1.21-test * v1.22/forgejo => v1.22-test * etc. --- .forgejo/testdata/build-release/Dockerfile | 5 +- .../workflows/build-release-integration.yml | 94 ++++++++++++------- .forgejo/workflows/build-release.yml | 52 +++++++--- 3 files changed, 101 insertions(+), 50 deletions(-) diff --git a/.forgejo/testdata/build-release/Dockerfile b/.forgejo/testdata/build-release/Dockerfile index 4b6933845..8dccad281 100644 --- a/.forgejo/testdata/build-release/Dockerfile +++ b/.forgejo/testdata/build-release/Dockerfile @@ -1,3 +1,4 @@ -FROM public.ecr.aws/docker/library/alpine:3.18 +FROM code.forgejo.org/oci/alpine:3.19 +ARG RELEASE_VERSION=unkown RUN mkdir -p /app/gitea -RUN ( echo '#!/bin/sh' ; echo "echo forgejo v1.2.3" ) > /app/gitea/gitea ; chmod +x /app/gitea/gitea +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-integration.yml b/.forgejo/workflows/build-release-integration.yml index 32e67964b..cdcbf3262 100644 --- a/.forgejo/workflows/build-release-integration.yml +++ b/.forgejo/workflows/build-release-integration.yml @@ -34,10 +34,10 @@ jobs: lxc-ip-prefix: 10.0.9 - name: publish the forgejo release + shell: bash run: | set -x - version=1.2.3 cat > /etc/docker/daemon.json < $binary$suffix + if test "$suffix" = .xz ; then + unxz --keep $binary$suffix + fi + chmod +x $binary + ./$binary --version | grep $version + curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$binary$suffix.sha256 > $binary$suffix.sha256 + shasum -a 256 --check $binary$suffix.sha256 + rm $binary$suffix + done + done + + local sources=forgejo-src-$version.tar.gz + curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$sources > $sources + curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$sources.sha256 > $sources.sha256 + shasum -a 256 --check $sources.sha256 + + docker pull ${{ steps.forgejo.outputs.host-port }}/root/forgejo:$version + docker pull ${{ steps.forgejo.outputs.host-port }}/root/forgejo:$version-rootless + } + # # Create a new project with a fake forgejo and the release workflow only # @@ -62,46 +93,41 @@ jobs: cp $dir/Dockerfile $dir/Dockerfile.rootless forgejo-test-helper.sh push $dir $url root forgejo - sha=$(forgejo-test-helper.sh branch_tip $url root/forgejo main) + + forgejo-curl.sh api_json -X PUT --data-raw '{"data":"${{ steps.forgejo.outputs.token }}"}' $url/api/v1/repos/root/forgejo/actions/secrets/TOKEN + forgejo-curl.sh api_json -X PUT --data-raw '{"data":"root"}' $url/api/v1/repos/root/forgejo/actions/secrets/DOER + forgejo-curl.sh api_json -X PUT --data-raw '{"data":"true"}' $url/api/v1/repos/root/forgejo/actions/secrets/VERBOSE # # Push a tag to trigger the release workflow and wait for it to complete # + version=1.2.3 + sha=$(forgejo-test-helper.sh branch_tip $url root/forgejo main) forgejo-curl.sh api_json --data-raw '{"tag_name": "v'$version'", "target": "'$sha'"}' $url/api/v1/repos/root/forgejo/tags - forgejo-curl.sh api_json -X PUT --data-raw '{"data":"${{ steps.forgejo.outputs.token }}"}' $url/api/v1/repos/root/forgejo/actions/secrets/TOKEN - forgejo-curl.sh api_json -X PUT --data-raw '{"data":"root"}' $url/api/v1/repos/root/forgejo/actions/secrets/DOER LOOPS=180 forgejo-test-helper.sh wait_success "$url" root/forgejo $sha + sanity_check $url $version # - # uncomment to see the logs even when everything is reported to be working ok + # Push a commit to a branch that triggers the build of a test release # - #cat $FORGEJO_RUNNER_LOGS + version=forgejo-test + ( + git clone $url/root/forgejo /tmp/forgejo + cd /tmp/forgejo + date > DATE + git config user.email root@example.com + git config user.name username + git add . + git commit -m 'update' + git push $url/root/forgejo main:forgejo + ) + sha=$(forgejo-test-helper.sh branch_tip $url root/forgejo forgejo) + LOOPS=180 forgejo-test-helper.sh wait_success "$url" root/forgejo $sha + sanity_check $url $version - # - # Minimal sanity checks. e2e test is for the setup-forgejo - # action and the infrastructure playbook. Since the binary - # is a script shell it does not test the sanity of the cross - # build, only the sanity of the naming of the binaries. - # - for arch in amd64 arm64 arm-6 ; do - binary=forgejo-$version-linux-$arch - for suffix in '' '.xz' ; do - curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$binary$suffix > $binary$suffix - if test "$suffix" = .xz ; then - unxz --keep $binary$suffix - fi - chmod +x $binary - ./$binary --version | grep $version - curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$binary$suffix.sha256 > $binary$suffix.sha256 - shasum -a 256 --check $binary$suffix.sha256 - rm $binary$suffix - done - done - - sources=forgejo-src-$version.tar.gz - curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$sources > $sources - curl --fail -L -sS $url/root/forgejo/releases/download/v$version/$sources.sha256 > $sources.sha256 - shasum -a 256 --check $sources.sha256 - - docker pull ${{ steps.forgejo.outputs.host-port }}/root/forgejo:$version - docker pull ${{ steps.forgejo.outputs.host-port }}/root/forgejo:$version-rootless + - name: full logs + if: always() + run: | + sed -e 's/^/[RUNNER LOGS] /' ${{ steps.forgejo.outputs.runner-logs }} + docker logs forgejo | sed -e 's/^/[FORGEJO LOGS]/' + sleep 5 # hack to avoid mixing outputs in Forgejo v1.21 diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index ebd99ea62..ddf5dfdeb 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -18,7 +18,10 @@ name: Build release on: push: - tags: 'v*' + tags: 'v[0-9]+.[0-9]+.*' + branches: + - 'forgejo' + - 'v*/forgejo' jobs: release: @@ -43,17 +46,34 @@ jobs: go-version: "1.21" check-latest: true - - name: version from ref_name - id: tag-version + - name: version from ref + id: release-info + shell: bash run: | - version="${{ github.ref_name }}" - version=${version##*v} - echo "value=$version" >> "$GITHUB_OUTPUT" + set -x + ref="${{ github.ref }}" + if [[ $ref =~ ^refs/heads/ ]] ; then + version=${ref#refs/heads/} + version=${version%/forgejo}-test + override=true + fi + if [[ $ref =~ ^refs/tags/ ]] ; then + version=${ref#refs/tags/} + override=false + fi + if test -z "$version" ; then + echo failed to figure out the release version from the reference=$ref + exit 1 + fi + version=${version#v} + echo "sha=${{ github.sha }}" >> "$GITHUB_OUTPUT" + echo "version=$version" >> "$GITHUB_OUTPUT" + echo "override=$override" >> "$GITHUB_OUTPUT" - name: release notes id: release-notes run: | - anchor=${{ steps.tag-version.outputs.value }} + anchor=${{ steps.release-info.outputs.version }} anchor=${anchor//./-} cat >> "$GITHUB_OUTPUT" < Date: Sat, 17 Feb 2024 11:55:52 +0100 Subject: [PATCH 2/2] [CI] mirror to forgejo-integration daily instead of each commit --- .forgejo/workflows/mirror.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/mirror.yml b/.forgejo/workflows/mirror.yml index 3a4099db5..599c8c01f 100644 --- a/.forgejo/workflows/mirror.yml +++ b/.forgejo/workflows/mirror.yml @@ -1,10 +1,8 @@ name: mirror on: - push: - branches: - - 'forgejo' - - 'v*/forgejo' + schedule: + - cron: '@daily' jobs: mirror: