This commit is contained in:
Alex Janka 2024-06-15 11:52:44 +10:00
parent b5914277d3
commit c625377da9
4 changed files with 17 additions and 17 deletions

View file

@ -127,16 +127,16 @@ case "$1" in
CI_COMMIT_TAG="$CI_COMMIT_TAG_RESOLVE" CI_COMMIT_TAG="$CI_COMMIT_TAG_RESOLVE"
fi fi
if [ $CI_COMMIT_TAG ] ; then if [ $CI_COMMIT_TAG ] ; then
CI_RELEASE_ASSETS=$(curl $CI_VERIFY_API/api/v1/repos/$CI_VERIFY_REPO/releases/tags/$CI_COMMIT_TAG | jq -c '.assets[]' | grep linux-amd64) CI_RELEASE_ASSETS=$(curl $CI_VERIFY_API/api/v1/repos/$CI_VERIFY_REPO/releases/tags/$CI_COMMIT_TAG | jq -c '.assets[]' | grep linux-arm64)
CI_RELEASE_BINARY_URL=$(echo "$CI_RELEASE_ASSETS" | grep linux-amd64\" | jq -r --jsonargs .browser_download_url) CI_RELEASE_BINARY_URL=$(echo "$CI_RELEASE_ASSETS" | grep linux-arm64\" | jq -r --jsonargs .browser_download_url)
CI_RELEASE_SHA256=$(curl $(echo "$CI_RELEASE_ASSETS" | grep linux-amd64.sha256\" | jq -r --jsonargs .browser_download_url) | cut -d ' ' -f1) CI_RELEASE_SHA256=$(curl $(echo "$CI_RELEASE_ASSETS" | grep linux-arm64.sha256\" | jq -r --jsonargs .browser_download_url) | cut -d ' ' -f1)
wget -nv --content-disposition $CI_RELEASE_BINARY_URL wget -nv --content-disposition $CI_RELEASE_BINARY_URL
DOWNLOAD_SHA256=$(sha256sum forgejo-*-linux-amd64 | cut -d ' ' -f1) DOWNLOAD_SHA256=$(sha256sum forgejo-*-linux-arm64 | cut -d ' ' -f1)
if [ $CI_RELEASE_SHA256 != $DOWNLOAD_SHA256 ] ; then if [ $CI_RELEASE_SHA256 != $DOWNLOAD_SHA256 ] ; then
echo "ERROR: Downloaded file didn't match expected SHA256 sum" echo "ERROR: Downloaded file didn't match expected SHA256 sum"
exit 1 exit 1
fi fi
mv forgejo-*-linux-amd64 $2 mv forgejo-*-linux-arm64 $2
chmod +x $2 chmod +x $2
exit 0 exit 0
else else

View file

@ -57,10 +57,10 @@ jobs:
- name: Download Forgejo binary - name: Download Forgejo binary
run: ./.ci-make.sh download-binary forgejo-bin-dl run: ./.ci-make.sh download-binary forgejo-bin-dl
- name: Build Forgejo for amd64 - name: Build Forgejo for arm64
run: ./.ci-make.sh submodule-build forgejo forgejo-bin run: ./.ci-make.sh submodule-build forgejo forgejo-bin
- name: Build Forgejo (with SQLite) for amd64 - name: Build Forgejo (with SQLite) for arm64
run: ./.ci-make.sh submodule-build forgejo forgejo-sqlite-bin run: ./.ci-make.sh submodule-build forgejo forgejo-sqlite-bin
env: env:
TAGS: sqlite sqlite_unlock_notify TAGS: sqlite sqlite_unlock_notify
@ -82,7 +82,7 @@ jobs:
./.ci-make.sh pkg-gen-sha256 ./.ci-make.sh pkg-gen-sha256
./.ci-make.sh preview-sha256 ./.ci-make.sh preview-sha256
- run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_arm64.deb
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
@ -105,7 +105,7 @@ jobs:
with: with:
name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
- run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_arm64.deb
installtest-bullseye-sqlite: installtest-bullseye-sqlite:
runs-on: bullseye runs-on: bullseye
@ -120,7 +120,7 @@ jobs:
with: with:
name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
- run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_arm64.deb
installtest-buster-sqlite: installtest-buster-sqlite:
runs-on: buster runs-on: buster
@ -135,7 +135,7 @@ jobs:
with: with:
name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
- run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_arm64.deb
installtest-bookworm-user: installtest-bookworm-user:
runs-on: bookworm runs-on: bookworm
@ -151,7 +151,7 @@ jobs:
name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
- run: ./.ci-make.sh test-userinst-prep - run: ./.ci-make.sh test-userinst-prep
- run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo_*_arm64.deb
testsuite-repo-upgrade-sqlite: testsuite-repo-upgrade-sqlite:
runs-on: bookworm runs-on: bookworm
@ -168,7 +168,7 @@ jobs:
- run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite
- run: ./.ci-make.sh force-clean-forgejo - run: ./.ci-make.sh force-clean-forgejo
- run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_arm64.deb
- run: ./.ci-make.sh verify-data-dir-chmod - run: ./.ci-make.sh verify-data-dir-chmod
installtest-buster-bin: installtest-buster-bin:
@ -184,7 +184,7 @@ jobs:
with: with:
name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
- run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_arm64.deb
publish-release-repo: publish-release-repo:
runs-on: bookworm runs-on: bookworm

View file

@ -1,5 +1,5 @@
Package: forgejo-bin Package: forgejo-bin
Architecture: amd64 Architecture: arm64
Priority: optional Priority: optional
Provides: forgejo, gitea Provides: forgejo, gitea
Depends: adduser (>= 3.11), git Depends: adduser (>= 3.11), git

View file

@ -5,7 +5,7 @@ Maintainer: crystal <crystal@noreply.codeberg.org>
Build-Depends: debhelper (>= 10) Build-Depends: debhelper (>= 10)
Package: forgejo Package: forgejo
Architecture: amd64 Architecture: arm64
Priority: optional Priority: optional
Provides: gitea Provides: gitea
Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git
@ -14,7 +14,7 @@ Description: Forgejo: Beyond Coding. We Forge.
Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup
Package: forgejo-sqlite Package: forgejo-sqlite
Architecture: amd64 Architecture: arm64
Priority: optional Priority: optional
Provides: forgejo, gitea Provides: forgejo, gitea
Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git