From 9ec39e131221014c87ab5be0d476d8e1f64e1933 Mon Sep 17 00:00:00 2001 From: Xorg Date: Sun, 23 Oct 2022 17:26:13 +0200 Subject: [PATCH] CI: update actions to Node16 All actions using Node12 are deprecated: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12 --- .github/workflows/release.yml | 2 +- .github/workflows/unix.yml | 4 ++-- .github/workflows/windows.yml | 31 +++++++++++++------------------ 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 834d6ec..ae62a0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get Git tag run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index 85d4268..e021a79 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -21,7 +21,7 @@ jobs: OS_NAME: ${{ matrix.os.name }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Generate build system run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="" -DLIBCPUID_TESTS:BOOL=ON @@ -43,7 +43,7 @@ jobs: DESTDIR: ${{ github.workspace }}/installdir - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ matrix.os.name }} path: installdir/* diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2800fd8..9131c99 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -25,10 +25,10 @@ jobs: PTS: v142 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: Build with MSBuild run: | @@ -38,24 +38,19 @@ jobs: /property:PlatformToolset=$Env:PTS ` /verbosity:normal - - name: Write Readme.win - uses: DamianReeves/write-file-action@master - with: - path: Readme.win - contents: | - The binaries here are compiled with Microsoft Visual C++. The following configurations are built: - - Debug\ - no optimizations, using the static debug C runtime (/MTd) - Release\ - optimizations on, using the static C runtime (/MT) - ReleaseDLL\ - the library is compiled in a .dll (libcpuid.dll), which you'd need to ship alongside your executable. Static C runtime. - - Operating system and compiler version: - write-mode: overwrite - - name: Prepate artifacts run: | mkdir -pv "$DESTDIR/"{bin,include,lib} - echo -e "$(cat Readme.win)\n$(wmic os get caption,version -value | sed '/^[[:space:]]*$/d')\n$(MSBuild.exe -version | sed '/^[[:space:]]*$/d')" > "$DESTDIR/Readme.win" + cat < "$DESTDIR/Readme.win" + The binaries here are compiled with Microsoft Visual C++. The following configurations are built: + + Debug\ - no optimizations, using the static debug C runtime (/MTd) + Release\ - optimizations on, using the static C runtime (/MT) + ReleaseDLL\ - the library is compiled in a .dll (libcpuid.dll), which you'd need to ship alongside your executable. Static C runtime. + + Operating system and compiler version: + $(wmic os get caption,version -value | sed '/^[[:space:]]*$/d')\n$(MSBuild.exe -version | sed '/^[[:space:]]*$/d') + EOF install -v AUTHORS ChangeLog COPYING Readme.md "$DESTDIR/" install -v libcpuid/{libcpuid_constants.h,libcpuid.h,libcpuid_types.h} "$DESTDIR/include/" cd "$GITHUB_WORKSPACE/cpuid_tool/$BITNESS" && find * -type f -name '*.exe' -exec install -Dv "{}" "$DESTDIR/bin/{}" \; @@ -65,7 +60,7 @@ jobs: DESTDIR: ${{ github.workspace }}/installdir - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ matrix.platform.name }} path: installdir/*