fixes

thejohnfreeman · Dec 11, 2024 · eb54f95 · eb54f95
1 parent c7f2aa4
commit eb54f95
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/libxrpl.yml b/.github/workflows/libxrpl.yml
@@ -47,7 +47,7 @@ jobs:
           conan remote list
           conan remote remove ripple || true
           # Do not quote the URL. An empty string will be accepted (with a non-fatal warning), but a missing argument will not.
-          conan remote add ripple ${{ env.CONAN_URL }} --insert 0
+          conan remote add --index 0 ripple ${{ env.CONAN_URL }}
       - name: Parse new version
         id: version
         shell: bash

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -53,7 +53,9 @@ jobs:
           conan config install .github/conan/
           conan profile detect --name detected || true
           touch $(conan config home)/profiles/matrix
-          conan profile show --profile default | tee "${GITHUB_STEP_SUMMARY}"
+          echo '```' >> "${GITHUB_STEP_SUMMARY}"
+          conan profile show --profile default | tee --append "${GITHUB_STEP_SUMMARY}"
+          echo '```' >> "${GITHUB_STEP_SUMMARY}"
       - name: build dependencies
         uses: ./.github/actions/dependencies
         env:

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -71,11 +71,11 @@ jobs:
           pip install --upgrade conan
       - name: check environment
         run: |
+          env | sort
           echo ${PATH} | tr ':' '\n'
           python --version | tee --append "${GITHUB_STEP_SUMMARY}"
           conan --version | tee --append "${GITHUB_STEP_SUMMARY}"
           cmake --version | tee --append "${GITHUB_STEP_SUMMARY}"
-          env | sort
       - name: configure Conan
         run: |
           conan config install .github/conan/
@@ -86,7 +86,9 @@ jobs:
           {% set cc = "${{ matrix.profile.cc }}" %}
           {% set cxx = "${{ matrix.profile.cxx }}" %}
           EOF
-          conan profile show --profile default | tee "${GITHUB_STEP_SUMMARY}"
+          echo '```' >> "${GITHUB_STEP_SUMMARY}"
+          conan profile show --profile default | tee --append "${GITHUB_STEP_SUMMARY}"
+          echo '```' >> "${GITHUB_STEP_SUMMARY}"
       - name: archive profile
         # Create this archive before dependencies are added to the local cache.
         run: tar -czf conan.tar -C ~/.conan2 .

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -71,7 +71,9 @@ jobs:
           cat >$(conan config home)/profiles/matrix <<EOF
           {% set runtime = "MT${{ matrix.configuration == 'Debug' && 'd' || '' }}" %}
           EOF
-          conan profile show --profile default | tee "${GITHUB_STEP_SUMMARY}"
+          echo '```' >> "${GITHUB_STEP_SUMMARY}"
+          conan profile show --profile default | tee --append "${GITHUB_STEP_SUMMARY}"
+          echo '```' >> "${GITHUB_STEP_SUMMARY}"
       - name: build dependencies
         uses: ./.github/actions/dependencies
         env: