Skip to content

Commit 03e90ef

Browse files
authored
fix commit
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir@psauxit.com>
1 parent 79b512d commit 03e90ef

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

.github/workflows/build-and-commit-safexec.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- name: Build libnpp_norm shim (aarch64, glibc)
109109
run: |
110110
set -euo pipefail
111-
docker run --rm --platform=linux/arm64 -v "$PWD":/src -w /src ubuntu:20.04 bash -euxo pipefail -c '
111+
docker run --rm --platform=linux/arm64 -v "$PWD":/src -w /src debian:bullseye-slim bash -euxo pipefail -c '
112112
apt-get update
113113
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential binutils
114114
gcc -O2 -pipe -fPIC -Wall -Wextra -Wformat=2 -DWGET_FASTPATH \
@@ -479,7 +479,9 @@ jobs:
479479
480480
# Make sure we're up-to-date with the remote branch
481481
git fetch --prune origin
482+
git stash push -u -m "ci-artifacts" || true
482483
git checkout -B "${BRANCH}" "origin/${BRANCH}"
484+
git stash pop || true
483485
484486
# Stage artifacts
485487
git add safexec/bin/safexec-*-linux-musl safexec/bin/libnpp_norm-*.so safexec/bin/*.sha256 safexec/bin/SHA256SUMS || true
@@ -627,8 +629,13 @@ jobs:
627629
git config user.name "github-actions[bot]"
628630
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
629631
632+
mkdir -p .git/info
633+
printf 'safexec/bin/\n' >> .git/info/exclude
634+
630635
git fetch --prune origin
636+
git stash push -u -m "ci-artifacts" || true
631637
git checkout -B "${BRANCH}" "origin/${BRANCH}"
638+
git stash pop || true
632639
633640
git add safexec/deb/*.deb safexec/deb/SHA256SUMS || true
634641
if git diff --cached --quiet; then

0 commit comments

Comments
 (0)