preparation for merge

dice-group · Jun 3, 2024 · 7290ac9 · 7290ac9
1 parent 46fb0bb
commit 7290ac9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/publish-conan-branch-package.yml b/.github/workflows/publish-conan-branch-package.yml
@@ -39,7 +39,7 @@ jobs:
           sudo apt-get install -y jq python3 python3-pip
 
       - name: Add repos for for gcc-13 and clang-16,17
-        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt@feature/conan2_utils
+        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt
 
       - name: Ensure stdlib version
         run: |
@@ -60,7 +60,7 @@ jobs:
         uses: rui314/setup-mold@v1
 
       - name: Install conan
-        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan@feature/conan2_utils
+        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan
         with:
           conan-version: ${{ inputs.conan-version }}
 

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -49,7 +49,7 @@ jobs:
           sudo apt-get install -y jq python3 python3-pip
 
       - name: Add repos for for gcc-13 and clang-16,17
-        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt@feature/conan2_utils
+        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt
 
       - name: Ensure stdlib version
         run: |
@@ -70,7 +70,7 @@ jobs:
         uses: rui314/setup-mold@v1
 
       - name: Install conan
-        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan@feature/conan2_utils
+        uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan
         with:
           conan-version: ${{ inputs.conan-version }}