From 81e0fc38818a6f33d1f093e701719c941e2a719c Mon Sep 17 00:00:00 2001 From: James Date: Mon, 13 Jan 2025 10:31:29 -0600 Subject: [PATCH] Updates for 3.1-rc.2 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/release.yaml | 2 +- dist/net.longturn.freeciv21.metainfo.xml.in | 2 +- dist/net.longturn.freeciv21.modpack.metainfo.xml.in | 2 +- dist/net.longturn.freeciv21.ruledit.metainfo.xml.in | 2 +- dist/net.longturn.freeciv21.server.metainfo.xml.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 476aa80d7a..bccd323f0f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -197,7 +197,7 @@ jobs: - uses: lukka/run-vcpkg@v11 name: Install dependencies with: - vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da + vcpkgGitCommitId: b322364f06308bdd24823f9d8f03fe0cc86fd46f - name: Configure run: cmake -S . -B build --preset "windows-debug" - name: Building @@ -234,7 +234,7 @@ jobs: - uses: lukka/run-vcpkg@v11 name: Install dependencies with: - vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da + vcpkgGitCommitId: b322364f06308bdd24823f9d8f03fe0cc86fd46f - name: Build uses: lukka/run-cmake@v10 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8658c4a928..577b838216 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -113,4 +113,4 @@ jobs: SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} with: snap: ${{ steps.snapcraft.outputs.snap }} - release: stable + release: candidate diff --git a/dist/net.longturn.freeciv21.metainfo.xml.in b/dist/net.longturn.freeciv21.metainfo.xml.in index c82cc59d50..5bc38d3d7d 100644 --- a/dist/net.longturn.freeciv21.metainfo.xml.in +++ b/dist/net.longturn.freeciv21.metainfo.xml.in @@ -36,6 +36,6 @@ mild - + diff --git a/dist/net.longturn.freeciv21.modpack.metainfo.xml.in b/dist/net.longturn.freeciv21.modpack.metainfo.xml.in index 3dbb55ae4a..bee344671f 100644 --- a/dist/net.longturn.freeciv21.modpack.metainfo.xml.in +++ b/dist/net.longturn.freeciv21.modpack.metainfo.xml.in @@ -36,6 +36,6 @@ mild - + diff --git a/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in b/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in index 14d5e46f44..3e8cc31366 100644 --- a/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in +++ b/dist/net.longturn.freeciv21.ruledit.metainfo.xml.in @@ -36,6 +36,6 @@ mild - + diff --git a/dist/net.longturn.freeciv21.server.metainfo.xml.in b/dist/net.longturn.freeciv21.server.metainfo.xml.in index f1a08a297a..b8d31b12f2 100644 --- a/dist/net.longturn.freeciv21.server.metainfo.xml.in +++ b/dist/net.longturn.freeciv21.server.metainfo.xml.in @@ -36,6 +36,6 @@ mild - +