Skip to content

Commit

Permalink
[misc] update GitHub Actions dependencies to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
pbatard committed Jun 11, 2024
1 parent bd17edc commit 9b4b26d
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand All @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand All @@ -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: |
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
autotools
git
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -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
21 changes: 16 additions & 5 deletions .github/workflows/vs2022.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions examples/wdi-simple.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/zadig.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions examples/zadig.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions libwdi/libwdi.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 9b4b26d

Please sign in to comment.