From b6b12b2a1c3fe771749ce40f74e8cad05668deec Mon Sep 17 00:00:00 2001
From: Martin Habovstiak <martin.habovstiak@gmail.com>
Date: Thu, 18 Jul 2024 22:58:57 +0200
Subject: [PATCH] Fix `BUILD_DIR` in CI

The authoritative build machine use `/home/user/cadr-build`, not
`/home/user/cadr-build/build`. This was probably source of
non-determinism.
---
 .github/workflows/ci.yml | 19 ++++++++++---------
 ci/build.sh              |  7 ++++---
 ci/get_cache_key.sh      |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07cfc28..93a58c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,12 +9,13 @@ on:
 
 env:
   USER_NAME: user
+  REPO_DIR: /home/user/cryptoanarchy-deb-repo-builder
   BUILD_DIR: /home/user/cadr-build
   IMAGE_NAME: cadr/cadr
   CONTAINER_NAME: cadr
   CI_SCRIPT: ci/build.sh
   PODMAN_CMD: "sudo -E XDG_RUNTIME_DIR= podman"
-  SPAWN_CONTAINER: "$PODMAN_CMD run --tmpfs /tmp --tmpfs /run --tmpfs /run/lock -v /sys/fs/cgroup:/sys/fs/cgroup:ro --privileged --systemd=true -d -v $PWD:$BUILD_DIR --name=$CONTAINER_NAME $IMAGE_NAME"
+  SPAWN_CONTAINER: "$PODMAN_CMD run --tmpfs /tmp --tmpfs /run --tmpfs /run/lock -v /sys/fs/cgroup:/sys/fs/cgroup:ro --privileged --systemd=true -d -v $PWD:$REPO_DIR --name=$CONTAINER_NAME $IMAGE_NAME"
   EXECUTE_CMD: "$PODMAN_CMD exec -u $USER_NAME -i $CONTAINER_NAME"
 
 jobs:
@@ -71,7 +72,7 @@ jobs:
       - name: Get cache key
         id: get-cache-key
         run: |
-          eval $EXECUTE_CMD bash "${BUILD_DIR}/ci/get_cache_key.sh" "${{ matrix.source }}" >> $GITHUB_OUTPUT
+          eval $EXECUTE_CMD bash "${REPO_DIR}/ci/get_cache_key.sh" "${{ matrix.source }}" >> $GITHUB_OUTPUT
       - name: Fetch package cache
         id: cache-packages
         uses: actions/cache@v3
@@ -83,9 +84,9 @@ jobs:
       - name: Build packages
         if: steps.cache-packages.outputs.cache-hit != 'true'
         run: |
-          eval $EXECUTE_CMD bash "${BUILD_DIR}/$CI_SCRIPT" "${{ matrix.source }}"
+          eval $EXECUTE_CMD bash "${REPO_DIR}/$CI_SCRIPT" "${{ matrix.source }}"
           sudo mkdir -p -m 777 packages
-          sudo mv -n build/*.deb packages
+          sudo mv -n ${BUILD_DIR}/*.deb packages
       - name: Upload Debian Packages Just Built to Artifact
         uses: actions/upload-artifact@v2
         with:
@@ -93,7 +94,7 @@ jobs:
           path: packages
       - name: Check SHA256
         run: |
-          sudo chown -R $USER build
+          sudo chown -R $USER /home/user
           cd packages
           for file in *.deb
           do
@@ -133,7 +134,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup Test Prefix
         run: |
-          echo "TEST_PREFIX=sudo chown -R $USER_NAME $BUILD_DIR && cd $BUILD_DIR && make BUILD_DIR=$BUILD_DIR/build" >> $GITHUB_ENV
+          echo "TEST_PREFIX=sudo chown -R $USER_NAME $REPO_DIR && cd $REPO_DIR && make BUILD_DIR=$BUILD_DIR" >> $GITHUB_ENV
       - name: Prepare Podman Container Running Environment
         run: |
           sudo apt-get update
@@ -180,7 +181,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup Test Prefix
         run: |
-          echo "TEST_PREFIX=sudo chown -R $USER_NAME $BUILD_DIR && cd $BUILD_DIR && make BUILD_DIR=$BUILD_DIR/build" >> $GITHUB_ENV
+          echo "TEST_PREFIX=sudo chown -R $USER_NAME $REPO_DIR && cd $REPO_DIR && make BUILD_DIR=$BUILD_DIR" >> $GITHUB_ENV
       - name: Prepare Podman Container Running Environment
         run: |
           sudo apt-get update
@@ -204,8 +205,8 @@ jobs:
           path: packages
       - name: Test multi-package CADR integration
         run: |
-          mkdir -p build
-          mv packages/*/*.deb build/
+          mkdir -p ${BUILD_DIR}
+          mv packages/*/*.deb ${BUILD_DIR}
           eval $SPAWN_CONTAINER
           eval $EXECUTE_CMD bash -c "\"$TEST_PREFIX test-here-multi-package-${{ matrix.test }}\""
           $PODMAN_CMD rm -f $CONTAINER_NAME
diff --git a/ci/build.sh b/ci/build.sh
index 8c7f12c..e80a1dd 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -3,9 +3,10 @@
 set -ex
 
 BUILD_DIR=/home/user/cadr-build
+REPO_DIR=/home/user/cryptoanarchy-deb-repo-builder
 sudo apt-get update
-sudo chown -R user $BUILD_DIR
-cd $BUILD_DIR
-MKCMD="make SOURCES="$1" BUILD_DIR=${BUILD_DIR}/build"
+sudo chown -R user $REPO_DIR
+cd $REPO_DIR
+MKCMD="make SOURCES="$1" BUILD_DIR=${BUILD_DIR}"
 $MKCMD build-dep
 $MKCMD all
diff --git a/ci/get_cache_key.sh b/ci/get_cache_key.sh
index d5c29e1..70b5205 100755
--- a/ci/get_cache_key.sh
+++ b/ci/get_cache_key.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-cd /home/user/cadr-build
+cd /home/user/cryptoanarchy-deb-repo-builder
 
 dep="$1"
 src="build_rules/$dep.yaml"