update to build on github actions

Author: leafo

.github/workflows/build.yml

@@ -0,0 +1,40 @@
+name: Build firejail
+
+on:
+  push:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y p7zip-full
+      - name: Build
+        env:
+          CI_ARCH: ${{ matrix.arch }}
+        run: scripts/ci-build.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          name: binaries-${{ matrix.arch }}
+          path: binaries/
+
+  deploy:
+    needs: build
+    if: github.ref_type == 'tag'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          path: binaries/
+          merge-multiple: true
+      - name: Deploy
+        run: scripts/ci-deploy.sh

.gitlab-ci.yml

@@ -4,22 +4,20 @@ export CI_OS="linux"
 
 if [ "$CI_ARCH" = "amd64" ]; then
   export CFLAGS=-m64 CXXFLAGS=-m64 LDFLAGS=-m64
-else
-  export CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32
 fi
 
 7za | head -2
 gcc -v
 
 export FIREJAIL_VERSION=head
-export CI_VERSION=$CI_BUILD_REF_NAME
-if [ -n "$CI_BUILD_TAG" ]; then
-  export FIREJAIL_VERSION=$CI_BUILD_TAG
-  export CI_VERSION=v${CI_BUILD_REF_NAME}
+export CI_VERSION=$GITHUB_REF_NAME
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+  export FIREJAIL_VERSION=$GITHUB_REF_NAME
+  export CI_VERSION=v${GITHUB_REF_NAME}
 fi
 
 git clone https://github.com/netblue30/firejail.git firejail-repo
-(cd firejail-repo && git checkout $CI_BUILD_REF_NAME && ./configure --disable-globalcfg && make -j3)
+(cd firejail-repo && git checkout $GITHUB_REF_NAME && ./configure --disable-globalcfg && make -j3)
 mv firejail-repo/src/firejail/firejail .
 
 strip firejail
@@ -44,7 +42,6 @@ mv firejail $BINARIES_DIR/$CI_VERSION
 
 (cd $BINARIES_DIR/$CI_VERSION && sha1sum * > SHA1SUMS)
 
-if [ -n "$CI_BUILD_TAG" ]; then
-  echo $CI_BUILD_TAG > $BINARIES_DIR/LATEST
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+  echo $GITHUB_REF_NAME > $BINARIES_DIR/LATEST
 fi
-

scripts/ci-build.sh

@@ -1,5 +1,3 @@
-#!/bin/sh
-
-# upload all artifacts from a single worker
-gsutil -m cp -r -a public-read binaries/* gs://dl.itch.ovh/firejail/
-
+#!/bin/sh -xe
+# placeholder deploy - just show collected artifacts
+ls -lR binaries/