diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7719d82..ba96b45 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive @@ -58,16 +58,16 @@ jobs: move libusbK* libusbk - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: cpp - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Build shell: cmd run: msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }},BuildMacros=${{ env.BUILD_MACROS }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index b7b533b..e595fd1 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive @@ -52,7 +52,7 @@ jobs: move libusb-win32* libusb0 move libusbK* libusbk - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Build with Coverity shell: cmd run: | diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 1b46b5c..0a259a7 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -53,7 +53,7 @@ jobs: autotools git - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive @@ -82,8 +82,19 @@ jobs: if: ${{ github.event_name == 'push' }} run: sha256sum artifacts/${{ matrix.env }}/*.exe - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' }} with: - name: MinGW + name: ${{ matrix.sys }} path: ./artifacts/*/*.exe + + Merge-Artifacts: + runs-on: windows-latest + needs: MinGW-Build + steps: + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + if: ${{ github.event_name == 'push' }} + with: + name: MinGW + delete-merged: true \ No newline at end of file diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml index 445c37d..5ce91a4 100644 --- a/.github/workflows/vs2022.yml +++ b/.github/workflows/vs2022.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive @@ -53,7 +53,7 @@ jobs: move libusbK* libusbk - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Build shell: cmd @@ -65,7 +65,7 @@ jobs: ) - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' }} with: name: VS2022 @@ -76,7 +76,7 @@ jobs: run: sha256sum ./*/*/examples/*.exe - name: Compress release-ready version of Zadig - uses: crazy-max/ghaction-upx@v2 + uses: crazy-max/ghaction-upx@v3 if: startsWith(github.ref, 'refs/tags/') with: version: latest @@ -94,8 +94,19 @@ jobs: sha256sum zadig-*.exe - name: Upload release-ready version of Zadig - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: Zadig path: ./zadig-*.exe + + Merge-Artifacts: + runs-on: windows-latest + needs: VS2022-Build + steps: + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + if: ${{ github.event_name == 'push' }} + with: + name: Zadig + delete-merged: true \ No newline at end of file diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc index 1f559a3..a1da057 100644 --- a/examples/wdi-simple.rc +++ b/examples/wdi-simple.rc @@ -7,8 +7,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,784 - PRODUCTVERSION 1,5,0,784 + FILEVERSION 1,5,0,785 + PRODUCTVERSION 1,5,0,785 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -25,13 +25,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "WDI-Simple" - VALUE "FileVersion", "1.5.0.784" + VALUE "FileVersion", "1.5.0.785" VALUE "InternalName", "WDI-Simple" VALUE "LegalCopyright", "� 2010-2023 Pete Batard (LGPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html" VALUE "OriginalFilename", "wdi-simple.exe" VALUE "ProductName", "WDI-Simple" - VALUE "ProductVersion", "1.5.0.784" + VALUE "ProductVersion", "1.5.0.785" VALUE "Comments", "http://libwdi.akeo.ie" END END diff --git a/examples/zadig.h b/examples/zadig.h index b293a41..e2bab03 100644 --- a/examples/zadig.h +++ b/examples/zadig.h @@ -60,7 +60,7 @@ #define FIELD_ORANGE RGB(255,240,200) #define ARROW_GREEN RGB(92,228,65) #define ARROW_ORANGE RGB(253,143,56) -#define APP_VERSION "Zadig 2.8.784" +#define APP_VERSION "Zadig 2.8.785" // These are used to flag end users about the driver they are going to replace enum driver_type { diff --git a/examples/zadig.rc b/examples/zadig.rc index fc5e99b..1bc479b 100644 --- a/examples/zadig.rc +++ b/examples/zadig.rc @@ -246,8 +246,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,784,0 - PRODUCTVERSION 2,8,784,0 + FILEVERSION 2,8,785,0 + PRODUCTVERSION 2,8,785,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -264,13 +264,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Zadig" - VALUE "FileVersion", "2.8.784" + VALUE "FileVersion", "2.8.785" VALUE "InternalName", "Zadig" VALUE "LegalCopyright", "� 2010-2023 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "zadig.exe" VALUE "ProductName", "Zadig" - VALUE "ProductVersion", "2.8.784" + VALUE "ProductVersion", "2.8.785" VALUE "Comments", "https://zadig.akeo.ie" END END diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc index 32eb219..be4fee8 100644 --- a/libwdi/libwdi.rc +++ b/libwdi/libwdi.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,784 - PRODUCTVERSION 1,5,0,784 + FILEVERSION 1,5,0,785 + PRODUCTVERSION 1,5,0,785 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,13 +68,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "libwdi: Windows Driver Installer Library" - VALUE "FileVersion", "1.5.0.784" + VALUE "FileVersion", "1.5.0.785" VALUE "InternalName", "libwdi" VALUE "LegalCopyright", "� 2010-2023 Pete Batard (LGPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html" VALUE "OriginalFilename", "libwdi" VALUE "ProductName", "libwdi" - VALUE "ProductVersion", "1.5.0.784" + VALUE "ProductVersion", "1.5.0.785" VALUE "Comments", "http://libwdi.akeo.ie" END END