[Scummvm-git-logs] scummvm master -> ba2f91867479cdf3e16d4af2a05fd88d0899e6b7

[SupSuper]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bf38556143 CI: Bump vcpkg
ba2f918674 CI: Disable artifacts behind a flag


Commit: bf38556143fc2064217a7aa36934d6013487bf90
    https://github.com/scummvm/scummvm/commit/bf38556143fc2064217a7aa36934d6013487bf90
Author: SupSuper (supsuper at gmail.com)
Date: 2023-07-27T00:13:08+01:00

Commit Message:
CI: Bump vcpkg

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5cbeb092d34..936ef894ebf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
         uses: lukka/run-vcpkg at v11
         id: runvcpkg
         with:
-          vcpkgGitCommitId: 662dbb50e63af15baa2909b7eac5b1b87e86a0aa
+          vcpkgGitCommitId: 56954f1db97f38635782d5ad7cdfd45d2731c854
       - name: Integrate vcpkg
         run: |
           ${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}/vcpkg integrate install


Commit: ba2f91867479cdf3e16d4af2a05fd88d0899e6b7
    https://github.com/scummvm/scummvm/commit/ba2f91867479cdf3e16d4af2a05fd88d0899e6b7
Author: SupSuper (supsuper at gmail.com)
Date: 2023-07-27T00:13:08+01:00

Commit Message:
CI: Disable artifacts behind a flag

ScummVM is too big to upload to the main repository, but forks might find it useful

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 936ef894ebf..b40fe7586e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,11 +47,12 @@ jobs:
       - name: Integrate vcpkg
         run: |
           ${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}/vcpkg integrate install
-#      - name: Upload libs
-#        uses: actions/upload-artifact at v3
-#        with:
-#          name: libs-${{ matrix.triplet }}
-#          path: ${{ env.VCPKG_INSTALLED_DIR }}\\${{ matrix.triplet }}
+      - name: Upload libs
+        uses: actions/upload-artifact at v3
+        if: ${{ matrix.buildArtifacts }} == 'true'
+        with:
+          name: libs-${{ matrix.triplet }}
+          path: ${{ env.VCPKG_INSTALLED_DIR }}\\${{ matrix.triplet }}
       - name: Build create_project
         run: |
           cd devtools/create_project/cmake
@@ -72,26 +73,30 @@ jobs:
           cd build-scummvm
           ls
           msbuild scummvm.sln /m /p:VcpkgEnableManifest=true /p:BuildInParallel=true /p:Configuration=${{ env.CONFIGURATION }} /p:PreferredToolArchitecture=x64 /p:Platform=${{ matrix.platform }} /v:minimal
-#      - name: Upload scummvm
-#        uses: actions/upload-artifact at v3
-#        with:
-#          name: scummvm-${{ matrix.arch }}
-#          path: build-scummvm/${{ env.CONFIGURATION }}${{ matrix.arch }}/*.exe
-#      - name: Upload scummvm libs
-#        uses: actions/upload-artifact at v3
-#        with:
-#          name: scummvm-${{ matrix.arch }}
-#          path: ${{ env.VCPKG_INSTALLED_DIR }}\\${{ matrix.triplet }}\\bin\\*.dll
-#      - name: Upload scummvm symbols
-#        uses: actions/upload-artifact at v3
-#        with:
-#          name: symbols-${{ matrix.arch }}
-#          path: build-scummvm/${{ env.CONFIGURATION }}${{ matrix.arch }}/*.pdb
-#      - name: Upload scummvm libs symbols
-#        uses: actions/upload-artifact at v3
-#        with:
-#          name: symbols-${{ matrix.arch }}
-#          path: ${{ env.VCPKG_INSTALLED_DIR }}\\${{ matrix.triplet }}\\bin\\*.pdb
+      - name: Upload scummvm
+        uses: actions/upload-artifact at v3
+        if: ${{ matrix.buildArtifacts }} == 'true'
+        with:
+          name: scummvm-${{ matrix.arch }}
+          path: build-scummvm/${{ env.CONFIGURATION }}${{ matrix.arch }}/*.exe
+      - name: Upload scummvm libs
+        uses: actions/upload-artifact at v3
+        if: ${{ matrix.buildArtifacts }} == 'true'
+        with:
+          name: scummvm-${{ matrix.arch }}
+          path: ${{ env.VCPKG_INSTALLED_DIR }}\\${{ matrix.triplet }}\\bin\\*.dll
+      - name: Upload scummvm symbols
+        uses: actions/upload-artifact at v3
+        if: ${{ matrix.buildArtifacts }} == 'true'
+        with:
+          name: symbols-${{ matrix.arch }}
+          path: build-scummvm/${{ env.CONFIGURATION }}${{ matrix.arch }}/*.pdb
+      - name: Upload scummvm libs symbols
+        uses: actions/upload-artifact at v3
+        if: ${{ matrix.buildArtifacts }} == 'true'
+        with:
+          name: symbols-${{ matrix.arch }}
+          path: ${{ env.VCPKG_INSTALLED_DIR }}\\${{ matrix.triplet }}\\bin\\*.pdb
   xcode:
     name: Xcode
     runs-on: macos-latest