From fc86ce2488ea87f8a24f3dfeb95005529f11d532 Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Sat, 15 Jun 2024 11:52:44 +1000 Subject: [PATCH] arm64 --- .ci-make.sh | 10 +++++----- .forgejo/workflows/forgejo-deb.yml | 18 +++++++++--------- deb/.forgejo-bin.control | 2 +- deb/debian/control | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.ci-make.sh b/.ci-make.sh index 5e537e4..1fbaa7d 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -123,16 +123,16 @@ case "$1" in CI_COMMIT_TAG="$CI_COMMIT_TAG_RESOLVE" fi 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_BINARY_URL=$(echo "$CI_RELEASE_ASSETS" | grep linux-amd64\" | 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_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-arm64\" | jq -r --jsonargs .browser_download_url) + 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 - 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 echo "ERROR: Downloaded file didn't match expected SHA256 sum" exit 1 fi - mv forgejo-*-linux-amd64 $2 + mv forgejo-*-linux-arm64 $2 chmod +x $2 exit 0 else diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml index 7567e04..d762397 100644 --- a/.forgejo/workflows/forgejo-deb.yml +++ b/.forgejo/workflows/forgejo-deb.yml @@ -57,12 +57,12 @@ jobs: - name: Download Forgejo binary 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 env: TAGS: bindata - - name: Build Forgejo (with SQLite) for amd64 + - name: Build Forgejo (with SQLite) for arm64 run: ./.ci-make.sh submodule-build forgejo forgejo-sqlite-bin env: TAGS: bindata sqlite sqlite_unlock_notify @@ -84,7 +84,7 @@ jobs: ./.ci-make.sh pkg-gen-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 with: @@ -107,7 +107,7 @@ jobs: with: 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: runs-on: bullseye @@ -122,7 +122,7 @@ jobs: with: 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: runs-on: buster @@ -137,7 +137,7 @@ jobs: with: 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: runs-on: bookworm @@ -153,7 +153,7 @@ jobs: name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }} - 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: runs-on: bookworm @@ -170,7 +170,7 @@ jobs: - 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 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 installtest-buster-bin: @@ -186,7 +186,7 @@ jobs: with: 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: runs-on: bookworm diff --git a/deb/.forgejo-bin.control b/deb/.forgejo-bin.control index 5c093a2..8bd9185 100644 --- a/deb/.forgejo-bin.control +++ b/deb/.forgejo-bin.control @@ -1,5 +1,5 @@ Package: forgejo-bin -Architecture: amd64 +Architecture: arm64 Priority: optional Provides: forgejo,gitea Depends: adduser (>= 3.11), git diff --git a/deb/debian/control b/deb/debian/control index 323d688..4047430 100644 --- a/deb/debian/control +++ b/deb/debian/control @@ -5,7 +5,7 @@ Maintainer: crystal Build-Depends: debhelper (>= 10) Package: forgejo -Architecture: amd64 +Architecture: arm64 Priority: optional Provides: gitea Depends: 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 Package: forgejo-sqlite -Architecture: amd64 +Architecture: arm64 Priority: optional Provides: forgejo,gitea Depends: adduser (>= 3.11),git