arm

.ci-make.sh

@@ -19,7 +19,8 @@ case "$1" in
 	;;
 "submodule-make")
 	cd "$2"
-		shift;shift
+	shift
+	shift
 	make "$@"
 	exit $?
 	;;
@@ -130,16 +131,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
@@ -302,7 +303,7 @@ case "$1" in
 		apt upgrade -y
 		apt install forgejo$1
 		cp test-res/app.ini.modified /etc/forgejo/app.ini
-				apt install ./forgejo$1_*_amd64.deb ./forgejo-common_*_all.deb
+		apt install ./forgejo$1_*_arm64.deb ./forgejo-common_*_all.deb
 		cat /etc/forgejo/app.ini
 		;;
 	esac

.forgejo/workflows/forgejo-deb.yml

@@ -48,19 +48,19 @@ jobs:
           cd forgejo
           git update-ref refs/heads/tag_test $(git rev-parse --verify HEAD)
 
-      - run: ./.ci-make.sh submodule-make forgejo security-check
+      # - run: ./.ci-make.sh submodule-make forgejo security-check
       
       - run: ./.ci-make.sh submodule-make forgejo frontend
 
-      - run: ./.ci-make.sh submodule-make forgejo checks-backend
+      # - run: ./.ci-make.sh submodule-make forgejo checks-backend
 
       - 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
 
-      - 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: sqlite sqlite_unlock_notify
@@ -82,7 +82,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:
@@ -106,31 +106,31 @@ 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
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_arm64.deb
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_arm64.deb
       - run: ./.ci-make.sh full-instance-clean
       - run: ./.ci-make.sh test-userinst-prep
-      - 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 full-instance-clean userinst
       - 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
       - run: ./.ci-make.sh full-instance-clean userinst
       - run: ./.ci-make.sh test-userinst-prep
-      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_arm64.deb
       - run: ./.ci-make.sh full-instance-clean userinst
       - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite
-      - 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 full-instance-clean
       - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo
-      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_arm64.deb
       - run: ./.ci-make.sh verify-data-dir-chmod
       - run: ./.ci-make.sh full-instance-clean
       - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-bin
-      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_arm64.deb
       - run: ./.ci-make.sh verify-data-dir-chmod
       - run: ./.ci-make.sh full-instance-clean
       - run: ./.ci-make.sh complex-test split-deb-upgrade -sqlite
@@ -152,13 +152,13 @@ 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
       - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_arm64.deb
       - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_arm64.deb
       - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
 
@@ -179,20 +179,18 @@ 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
       - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_arm64.deb
       - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_arm64.deb
       - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
 
-  publish-release-repo:
+  publish:
     runs-on: bookworm
-    needs: [multitest-bookworm-lxc, multitest-bullseye-docker, multitest-buster-docker]
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb'
     steps:
       - uses: actions/checkout@v4
 
@@ -208,26 +206,12 @@ jobs:
       - run: mkdir forgejo-release
       - run: mv *.deb *.deb.sha256 forgejo-release/
 
-      - uses: actions/forgejo-release@v1
-        with:
-          direction: upload
-          url: https://codeberg.org
-          token: ${{ secrets.codeberg_api_key }}
-          release-dir: forgejo-release
-
-      - uses: actions/forgejo-release@v1
-        with:
-          direction: upload
-          url: https://code.forgejo.org
-          token: ${{ secrets.cfo_api_key }}
-          release-dir: forgejo-release
-
       - name: Debian package registry publish
         env:
-          FORGEJO_SITE: https://code.forgejo.org
-          FORGEJO_OWNER: forgejo-contrib
-          DEBIAN_DIST: bullseye
-          DEBIAN_COMPONENT: forgejo-lts
+          FORGEJO_SITE: https://git.alexjanka.com
+          FORGEJO_OWNER: alex
+          DEBIAN_DIST: testing
+          DEBIAN_COMPONENT: main
           FORGEJO_KEY: ${{ secrets.cfo_api_key }}
         run: |
           cd forgejo-release

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

deb/debian/control

@@ -5,7 +5,7 @@ Maintainer: crystal <crystal@noreply.codeberg.org>
 Build-Depends: debhelper (>= 10)
 
 Package: forgejo
-Architecture: amd64
+Architecture: arm64
 Priority: optional
 Provides: gitea
 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
 
 Package: forgejo-sqlite
-Architecture: amd64
+Architecture: arm64
 Priority: optional
 Provides: forgejo, gitea
 Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git