From a15e810329bd01d1fb1e43f5a6769dfe1694080d Mon Sep 17 00:00:00 2001 From: Tim Teulings Date: Fri, 2 Feb 2024 16:54:41 +0100 Subject: [PATCH 1/2] Update checkout plugin --- .github/workflows/build_and test_on_ios.yml | 2 +- .github/workflows/build_and test_on_msys.yml | 4 ++-- .github/workflows/build_and test_on_osx.yml | 4 ++-- .github/workflows/build_and test_on_ubuntu_20_04.yml | 4 ++-- .github/workflows/build_and test_on_ubuntu_22_04.yml | 10 +++++----- .github/workflows/build_and test_on_vs2019.yml | 4 ++-- .github/workflows/build_on_ubuntu_22_04_qt_android.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/release_latest.yml | 2 +- .github/workflows/sanitize_on_ubuntu_22_04.yml | 4 ++-- .github/workflows/webpage.yml | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_and test_on_ios.yml b/.github/workflows/build_and test_on_ios.yml index 506f61683..bd43c295b 100644 --- a/.github/workflows/build_and test_on_ios.yml +++ b/.github/workflows/build_and test_on_ios.yml @@ -16,7 +16,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install build tool run: brew install cmake ninja - name: Install dependencies diff --git a/.github/workflows/build_and test_on_msys.yml b/.github/workflows/build_and test_on_msys.yml index 7b57facfe..86c9f507a 100644 --- a/.github/workflows/build_and test_on_msys.yml +++ b/.github/workflows/build_and test_on_msys.yml @@ -19,7 +19,7 @@ jobs: shell: msys2 {0} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 # mingw-w64-x86_64-cairo mingw-w64-x86_64-pango - name: Setup MSYS/MINGW64 uses: msys2/setup-msys2@v2 @@ -50,7 +50,7 @@ jobs: shell: msys2 {0} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup MSYS/MINGW64 uses: msys2/setup-msys2@v2 with: diff --git a/.github/workflows/build_and test_on_osx.yml b/.github/workflows/build_and test_on_osx.yml index 46292fca4..d38a2ed18 100644 --- a/.github/workflows/build_and test_on_osx.yml +++ b/.github/workflows/build_and test_on_osx.yml @@ -16,7 +16,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install build tool run: brew install meson ninja - name: Install dependencies @@ -35,7 +35,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install build tool run: brew install cmake ninja - name: Install dependencies diff --git a/.github/workflows/build_and test_on_ubuntu_20_04.yml b/.github/workflows/build_and test_on_ubuntu_20_04.yml index 118df7b54..fe02f6f01 100644 --- a/.github/workflows/build_and test_on_ubuntu_20_04.yml +++ b/.github/workflows/build_and test_on_ubuntu_20_04.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler and Co @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler, cmake and ninja diff --git a/.github/workflows/build_and test_on_ubuntu_22_04.yml b/.github/workflows/build_and test_on_ubuntu_22_04.yml index 032f8df55..c04eecb44 100644 --- a/.github/workflows/build_and test_on_ubuntu_22_04.yml +++ b/.github/workflows/build_and test_on_ubuntu_22_04.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update package list run: sudo apt-get update - name: Install software-properties-common @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler and Co @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler, cmake and ninja @@ -118,7 +118,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler and Co @@ -146,7 +146,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler, cmake and ninja diff --git a/.github/workflows/build_and test_on_vs2019.yml b/.github/workflows/build_and test_on_vs2019.yml index e44e8bee2..7a27a41e6 100644 --- a/.github/workflows/build_and test_on_vs2019.yml +++ b/.github/workflows/build_and test_on_vs2019.yml @@ -16,7 +16,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy vcpkg.json run: copy vcpkg_medium.json vcpkg.json - name: Add msbuild to PATH @@ -79,7 +79,7 @@ jobs: shell: cmd steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python 3.x for meson uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build_on_ubuntu_22_04_qt_android.yml b/.github/workflows/build_on_ubuntu_22_04_qt_android.yml index 721e6d1fd..bd5469953 100644 --- a/.github/workflows/build_on_ubuntu_22_04_qt_android.yml +++ b/.github/workflows/build_on_ubuntu_22_04_qt_android.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 332dcb69d..b4df8b37c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: master fetch-depth: 0 diff --git a/.github/workflows/release_latest.yml b/.github/workflows/release_latest.yml index 1d7be0209..d1846266c 100644 --- a/.github/workflows/release_latest.yml +++ b/.github/workflows/release_latest.yml @@ -19,7 +19,7 @@ jobs: if: github.ref == 'refs/heads/master' steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/sanitize_on_ubuntu_22_04.yml b/.github/workflows/sanitize_on_ubuntu_22_04.yml index a537330a5..a497bb657 100644 --- a/.github/workflows/sanitize_on_ubuntu_22_04.yml +++ b/.github/workflows/sanitize_on_ubuntu_22_04.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update package list run: sudo apt-get update - name: Install software-properties-common @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install software-properties-common run: sudo apt-get install software-properties-common - name: Install gcc compiler, cmake and ninja diff --git a/.github/workflows/webpage.yml b/.github/workflows/webpage.yml index 4f7f16973..94134095a 100644 --- a/.github/workflows/webpage.yml +++ b/.github/workflows/webpage.yml @@ -14,7 +14,7 @@ jobs: environment: SOURCEFORGE steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update package list run: sudo apt-get update - name: Install additional tools From ec2a92ed35042eff4682873f319933cde4886b7a Mon Sep 17 00:00:00 2001 From: Tim Teulings Date: Sun, 4 Feb 2024 19:34:14 +0100 Subject: [PATCH 2/2] Further updates --- .github/workflows/build_and test_on_vs2019.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and test_on_vs2019.yml b/.github/workflows/build_and test_on_vs2019.yml index 7a27a41e6..2641b3635 100644 --- a/.github/workflows/build_and test_on_vs2019.yml +++ b/.github/workflows/build_and test_on_vs2019.yml @@ -20,11 +20,11 @@ jobs: - name: Copy vcpkg.json run: copy vcpkg_medium.json vcpkg.json - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v2 # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - name: Restore from cache and install vcpkg # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. - uses: lukka/run-vcpkg@v11.1 + uses: lukka/run-vcpkg@v11.4 with: runVcpkgInstall: false vcpkgJsonGlob: '**/vcpkg.json' @@ -66,7 +66,7 @@ jobs: run: copy /Y build\Demos\Debug\*.exe dist shell: cmd - name: Upload distribution archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Libosmscout_Windows.zip path: dist @@ -81,7 +81,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Setup Python 3.x for meson - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install meson and ninja