From d447b7e19e54587744fc45704dbdbd7e61259062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:54:57 +0100 Subject: [PATCH 1/5] CI: add macOS arm64 job --- .github/workflows/build.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d6cce72..f2b07c49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: Ubuntu: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Ubuntu run: | ./configure --with-fastfloat --with-threaded @@ -23,18 +23,21 @@ jobs: Ubuntu-20-04: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Ubuntu run: | ./configure --with-fastfloat --with-threaded make make check - MacOS: - runs-on: macos-latest + macOS: + strategy: + matrix: + runner: [ macos-12, macos-14 ] + runs-on: ${{ matrix.runner }} steps: - - uses: actions/checkout@v2 - - name: Build MacOS + - uses: actions/checkout@v4 + - name: Build macOS run: | ./configure --with-fastfloat --with-threaded make @@ -44,7 +47,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 with: arch: x64 @@ -59,7 +62,7 @@ jobs: Windows-32: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 with: arch: win32 @@ -74,7 +77,7 @@ jobs: Ubuntu-meson: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install packages run: | @@ -91,7 +94,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install packages run: | From 348274b79f1af366c975b07242254a45b61e3850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Mon, 5 Feb 2024 18:05:47 +0100 Subject: [PATCH 2/5] CI: deduplicate Ubuntu jobs --- .github/workflows/build.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2b07c49..25ab5feb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,10 @@ permissions: read-all jobs: Ubuntu: - runs-on: ubuntu-latest + strategy: + matrix: + runner: [ ubuntu-20.04, ubuntu-latest ] + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 - name: Build Ubuntu @@ -20,16 +23,6 @@ jobs: make make check - Ubuntu-20-04: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v4 - - name: Build Ubuntu - run: | - ./configure --with-fastfloat --with-threaded - make - make check - macOS: strategy: matrix: From efa33021263fddb642231907e1f437d80028a4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:58:00 +0100 Subject: [PATCH 3/5] CI: deduplicate Windows jobs --- .github/workflows/build.yml | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25ab5feb..f511f8cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,37 +36,23 @@ jobs: make make check - Windows-64: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v4 - - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: x64 - - - name: Build Windows 64 bit - run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|x64" /Project testbed - - - name: Run tests - run: testbed\testbed.exe --chdir testbed - - - Windows-32: + Windows: + strategy: + matrix: + arch: [ win32, x64 ] runs-on: windows-latest steps: - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 with: - arch: win32 - - - name: Build Windows 32 bit - run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|Win32" /Project testbed + arch: ${{ matrix.arch }} - - name: Run tests + - name: Build Windows + run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|${{ matrix.arch }}" /Project testbed + + - name: Run tests run: testbed\testbed.exe --chdir testbed - - + Ubuntu-meson: runs-on: ubuntu-latest steps: From c4832330baa05326d33dc3e1f5139f421167d223 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 08:13:09 +0000 Subject: [PATCH 4/5] Bump the github-actions group with 4 updates Bumps the github-actions group with 4 updates: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [ossf/scorecard-action](https://github.com/ossf/scorecard-action) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/checkout` from 2 to 4 - [Release notes](https://github.com/actions/checkout/releases) - [Commits](https://github.com/actions/checkout/compare/v2...v4) Updates `github/codeql-action` from 2 to 3 - [Release notes](https://github.com/github/codeql-action/releases) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) Updates `ossf/scorecard-action` from 2.1.2 to 2.3.1 - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/e38b1902ae4f44df626f11ba0734b14fb91f8f86...0864cf19026789058feabb7e87baa5f140aac736) Updates `actions/upload-artifact` from 3.1.0 to 4.3.1 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/3cea5372237819ed00197afe530f5a7ea3e805c8...5d5d22a31266ced268874388b861e4b58bb5c2f3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/scorecard.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5ebb981e..9f1fcd21 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -55,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -69,4 +69,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 901a86cd..14ade9f4 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -25,12 +25,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2 + uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 with: results_file: results.sarif results_format: sarif @@ -42,7 +42,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: SARIF file path: results.sarif @@ -50,6 +50,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4 + uses: github/codeql-action/upload-sarif@dc021d495cb77b369e4d9d04a501700fd83b8c51 # v2.24.0 with: sarif_file: results.sarif From 5a497490b11410bcd8d09f78c8fccf8341c1c6e1 Mon Sep 17 00:00:00 2001 From: Rajan Halade Date: Wed, 7 Feb 2024 09:27:25 -0800 Subject: [PATCH 5/5] Possible NPD in cmsCreate_OkLabProfile --- src/cmsvirt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cmsvirt.c b/src/cmsvirt.c index 6084647e..59cf2bfd 100644 --- a/src/cmsvirt.c +++ b/src/cmsvirt.c @@ -745,6 +745,8 @@ cmsHPROFILE CMSEXPORT cmsCreate_OkLabProfile(cmsContext ctx) cmsPipeline* BToA = cmsPipelineAlloc(ctx, 3, 3); cmsHPROFILE hProfile = cmsCreateProfilePlaceholder(ctx); + if (!hProfile) // can't allocate + goto error; cmsSetProfileVersion(hProfile, 4.4);