fix ci

cppfw · Nov 25, 2024 · 2631714 · 2631714
1 parent 9bb61ee
commit 2631714
Showing 1 changed file with 51 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -355,57 +355,57 @@ jobs:
         api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
       if: startsWith(github.ref, 'refs/tags/')
 ##### vcpkg #####
-vcpkg:
-  strategy:
-    fail-fast: false
-    matrix:
-      include:
-        - {os: debian, codename: bookworm, image_owner: }
-        # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
-        # - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
-        # - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
-  runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
-  container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
-  name: vcpkg - linux | ${{ matrix.labels[0] }}
-  steps:
-    - name: add cppfw deb repo
-      uses: myci-actions/add-deb-repo@main
-      with:
-        repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
-        repo-name: cppfw
-        keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
-        install: myci cmake git curl zip unzip tar nodejs pkg-config
-    - name: git clone
-      uses: myci-actions/checkout@main
-    - name: install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg.git vcpkg-installation
-        (cd vcpkg-installation; ./bootstrap-vcpkg.sh)
-    - name: set VCPKG_ROOT
-      uses: myci-actions/export-env-var@main
-      with: {name: VCPKG_ROOT, value: "$(pwd)/vcpkg-installation"}
-    - name: add VCPKG_ROOT to PATH
-      uses: myci-actions/export-env-var@main
-      with: {name: PATH, value: "$PATH:$VCPKG_ROOT"}
-    - name: prepare vcpkg port
-      run: |
-        myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
-    - name: test vcpkg port
-      run: |
-        cd vcpkg/test
-        cmake .
-        make
-        ./test
-    - name: upload vcpkg logs to artifacts
-      if: always() # even if previous steps fail, this one needs to be run
-      uses: actions/upload-artifact@v4
-      with:
-        name: vcpkg_logs
-        path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
-    - name: deploy vcpkg port
-      run: |
-        myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
-      if: startsWith(github.ref, 'refs/tags/')
+  vcpkg:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {os: debian, codename: bookworm, image_owner: }
+          # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
+          # - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
+          # - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
+    runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
+    container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
+    name: vcpkg - linux | ${{ matrix.labels[0] }}
+    steps:
+      - name: add cppfw deb repo
+        uses: myci-actions/add-deb-repo@main
+        with:
+          repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
+          repo-name: cppfw
+          keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
+          install: myci cmake git curl zip unzip tar nodejs pkg-config
+      - name: git clone
+        uses: myci-actions/checkout@main
+      - name: install vcpkg
+        run: |
+          git clone https://github.com/microsoft/vcpkg.git vcpkg-installation
+          (cd vcpkg-installation; ./bootstrap-vcpkg.sh)
+      - name: set VCPKG_ROOT
+        uses: myci-actions/export-env-var@main
+        with: {name: VCPKG_ROOT, value: "$(pwd)/vcpkg-installation"}
+      - name: add VCPKG_ROOT to PATH
+        uses: myci-actions/export-env-var@main
+        with: {name: PATH, value: "$PATH:$VCPKG_ROOT"}
+      - name: prepare vcpkg port
+        run: |
+          myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
+      - name: test vcpkg port
+        run: |
+          cd vcpkg/test
+          cmake .
+          make
+          ./test
+      - name: upload vcpkg logs to artifacts
+        if: always() # even if previous steps fail, this one needs to be run
+        uses: actions/upload-artifact@v4
+        with:
+          name: vcpkg_logs
+          path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
+      - name: deploy vcpkg port
+        run: |
+          myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
+        if: startsWith(github.ref, 'refs/tags/')
 ##### conan - linux #####
   conan-linux:
     strategy: