diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 39ab42761c..0c8479f19d 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -32,7 +32,7 @@ env: # duplication, we define it here using environment variables and create the # matrix in the first job. The matrix defined below should be kept in sync # with https://github.com/XRPLF/ci/blob/main/.github/workflows/debian.yml. - STRATEGY_MATRIX_ARCHITECTURE: | + STRATEGY_MATRIX_ARCHITECTURE: >- [ { "platform": "linux/amd64", @@ -43,7 +43,7 @@ env: "runner": "ubuntu-24.04-arm" } ] - STRATEGY_MATRIX_OS: | + STRATEGY_MATRIX_OS: >- [ { "release": "bookworm", @@ -81,12 +81,12 @@ env: "compiler_version": "19" } ] - STRATEGY_MATRIX_BUILDTYPE: | + STRATEGY_MATRIX_BUILDTYPE: >- [ "Debug", "Release" ] - STRATEGY_MATRIX_UNITY: | + STRATEGY_MATRIX_UNITY: >- [ "-DUnity=OFF", "-DUnity=ON" @@ -101,22 +101,19 @@ jobs: id: generate-matrix run: | # Use heredoc with random delimiter for multiline JSON. - DELIMITER_ARCHITECTURE="$(dd bs=512 if=/dev/urandom count=1 2>/dev/null | tr -dc 'a-zA-Z0-9' | head -c 20)" - echo "architecture << ${DELIMITER_ARCHITECTURE} + DELIMITER="$(openssl rand -hex 8)" + echo "architecture << ${DELIMITER} ${STRATEGY_MATRIX_ARCHITECTURE} - ${DELIMITER_ARCHITECTURE}" >> "$GITHUB_OUTPUT" - DELIMITER_OS="$(dd bs=512 if=/dev/urandom count=1 2>/dev/null | tr -dc 'a-zA-Z0-9' | head -c 20)" - echo "os << ${DELIMITER_OS} + ${DELIMITER}" >> "$GITHUB_OUTPUT" + echo "os << ${DELIMITER} ${STRATEGY_MATRIX_OS} - ${DELIMITER_OS}" >> "$GITHUB_OUTPUT" - DELIMITER_BUILDTYPE="$(dd bs=512 if=/dev/urandom count=1 2>/dev/null | tr -dc 'a-zA-Z0-9' | head -c 20)" - echo "build_type << ${DELIMITER_BUILDTYPE} + ${DELIMITER}" >> "$GITHUB_OUTPUT" + echo "build_type << ${DELIMITER} ${STRATEGY_MATRIX_BUILDTYPE} - ${DELIMITER_BUILDTYPE}" >> "$GITHUB_OUTPUT" - DELIMITER_UNITY="$(dd bs=512 if=/dev/urandom count=1 2>/dev/null | tr -dc 'a-zA-Z0-9' | head -c 20)" - echo "unity << ${DELIMITER_UNITY} + ${DELIMITER}" >> "$GITHUB_OUTPUT" + echo "unity << ${DELIMITER} ${STRATEGY_MATRIX_UNITY} - ${DELIMITER_UNITY}" >> "$GITHUB_OUTPUT" + ${DELIMITER}" >> "$GITHUB_OUTPUT" outputs: architecture: ${{ steps.generate-matrix.outputs.architecture }} os: ${{ steps.generate-matrix.outputs.os }}