This is an automated email from the ASF dual-hosted git repository.
piotr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iggy.git
The following commit(s) were added to refs/heads/master by this push:
new dce568b7 fix(ci): add Cross.toml for CI builds (#1667)
dce568b7 is described below
commit dce568b71c69db7e7e16391bfa4e716f3e643526
Author: Piotr Gankiewicz <[email protected]>
AuthorDate: Sat Mar 29 15:24:08 2025 +0100
fix(ci): add Cross.toml for CI builds (#1667)
---
.github/workflows/test_daily.yml | 3 ---
.github/workflows/test_nightly.yml | 3 ---
.gitignore | 1 -
scripts/prepare-cross-toml.sh => Cross.toml | 19 -------------------
scripts/prepare-cross-toml.sh | 6 +-----
5 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/.github/workflows/test_daily.yml b/.github/workflows/test_daily.yml
index 35ea9678..275a8794 100644
--- a/.github/workflows/test_daily.yml
+++ b/.github/workflows/test_daily.yml
@@ -108,9 +108,6 @@ jobs:
- name: Run tests ${{ matrix.platform.target }}
run: cross +stable test --features ci-qemu --verbose --target ${{
matrix.platform.target }} ${{ matrix.platform.profile == 'release' &&
'--release' || '' }}
- - name: Check if workspace is clean
- run: git status | grep "working tree clean" || { git status ; exit 1; }
-
finalize_nightly:
runs-on: ubuntu-latest
needs: build_and_test
diff --git a/.github/workflows/test_nightly.yml
b/.github/workflows/test_nightly.yml
index cb8ed291..73597c9d 100644
--- a/.github/workflows/test_nightly.yml
+++ b/.github/workflows/test_nightly.yml
@@ -109,9 +109,6 @@ jobs:
- name: Run tests ${{ matrix.platform.target }}
run: cross +stable test --features ci-qemu --verbose --target ${{
matrix.platform.target }} ${{ matrix.platform.profile == 'release' &&
'--release' || '' }}
- - name: Check if workspace is clean
- run: git status | grep "working tree clean" || { git status ; exit 1; }
-
finalize_nightly:
runs-on: ubuntu-latest
needs: build_and_test
diff --git a/.gitignore b/.gitignore
index c2cb572d..803ded12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,5 @@ local_data*
bench_*
/sdk/errors_table/
/rust-clippy-results.sarif
-/Cross.toml
/performance_results*
.env
diff --git a/scripts/prepare-cross-toml.sh b/Cross.toml
old mode 100755
new mode 100644
similarity index 71%
copy from scripts/prepare-cross-toml.sh
copy to Cross.toml
index 1bd56122..ac93743e
--- a/scripts/prepare-cross-toml.sh
+++ b/Cross.toml
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -23,22 +21,5 @@
# like current UID or GID must be entered (cannot be generated or fetched
# during cross execution time).
-readonly CROSS_TOML_FILE="Cross.toml"
-USER_UID=$(id -u)
-readonly USER_UID
-USER_GID=$(id -g)
-readonly USER_GID
-USER_NAME=$(id -un)
-readonly USER_NAME
-
-echo "Preparing ${CROSS_TOML_FILE} file for user ${USER_NAME} with UID
${USER_UID} and GID ${USER_GID}."
-
-cat << EOF > "${CROSS_TOML_FILE}"
[build.env]
passthrough = ["IGGY_SYSTEM_PATH", "IGGY_CI_BUILD", "RUST_BACKTRACE=1"]
-
-[build.dockerfile]
-file = "Dockerfile.cross"
-build-args = { USER = "${USER_NAME}", CROSS_CONTAINER_UID = "${USER_UID}",
CROSS_CONTAINER_GID = "${USER_GID}" }
-
-EOF
diff --git a/scripts/prepare-cross-toml.sh b/scripts/prepare-cross-toml.sh
index 1bd56122..9402e993 100755
--- a/scripts/prepare-cross-toml.sh
+++ b/scripts/prepare-cross-toml.sh
@@ -33,12 +33,8 @@ readonly USER_NAME
echo "Preparing ${CROSS_TOML_FILE} file for user ${USER_NAME} with UID
${USER_UID} and GID ${USER_GID}."
-cat << EOF > "${CROSS_TOML_FILE}"
-[build.env]
-passthrough = ["IGGY_SYSTEM_PATH", "IGGY_CI_BUILD", "RUST_BACKTRACE=1"]
-
+cat <<EOF >>"${CROSS_TOML_FILE}"
[build.dockerfile]
file = "Dockerfile.cross"
build-args = { USER = "${USER_NAME}", CROSS_CONTAINER_UID = "${USER_UID}",
CROSS_CONTAINER_GID = "${USER_GID}" }
-
EOF
