diff --git a/.github/actions/conan-configure/action.yml b/.github/actions/conan-configure/action.yml index 0b577b2fb3..b95597ba23 100644 --- a/.github/actions/conan-configure/action.yml +++ b/.github/actions/conan-configure/action.yml @@ -22,7 +22,9 @@ inputs: required: true type: string -# Install the Conan profiles and log into the specified remote. +# Install the Conan profiles and log into the specified remote. We first remove +# the remote if it already exists, which can occur on self-hosted runners where +# the workspace is not cleaned up between runs. runs: using: composite steps: @@ -41,8 +43,6 @@ runs: - name: Add Conan remote shell: bash run: | - # Remove the remote if it already exists. This can occur on self-hosted - # runners where the workspace is not cleaned up between runs. if conan remote list | grep -q '${{ inputs.conan_remote_name }}'; then conan remote remove ${{ inputs.conan_remote_name }} echo "Removed Conan remote '${{ inputs.conan_remote_name }}'." diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 7d9577dbe4..ddcaadbbee 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -32,16 +32,23 @@ 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: >- +# [ +# { +# "platform": "linux/amd64", +# "runner": "ubuntu-24.04" +# }, +# { +# "platform": "linux/arm64", +# "runner": "ubuntu-24.04-arm" +# } +# ] STRATEGY_MATRIX_ARCHITECTURE: >- [ { "platform": "linux/amd64", "runner": "ubuntu-24.04" }, - { - "platform": "linux/arm64", - "runner": "ubuntu-24.04-arm" - } ] STRATEGY_MATRIX_OS: >- [