Skip to content

Commit 6a1ec5b

Browse files
pbatardpbatard
committed
[misc] update GitHub Actions scripts
* Also restore CodeQL action, as its compatibility with VS2022 should have been fixed.
1 parent 63a59c3 commit 6a1ec5b

File tree

8 files changed

+21
-19
lines changed

8 files changed

+21
-19
lines changed

.github/workflows/codeql.nope renamed to .github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
move libusbK* libusbk
5959
6060
- name: Initialize CodeQL
61-
uses: github/codeql-action/init@v1
61+
uses: github/codeql-action/init@v2
6262
with:
6363
languages: cpp
6464

@@ -70,4 +70,4 @@ jobs:
7070
run: msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }},BuildMacros=${{ env.BUILD_MACROS }}
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@v1
73+
uses: github/codeql-action/analyze@v2

‎.github/workflows/coverity.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121

2222
jobs:
2323
Coverity-Build:
24-
runs-on: windows-2022
24+
runs-on: windows-latest
2525

2626
steps:
2727
- name: Checkout repository
@@ -55,7 +55,9 @@ jobs:
5555
uses: microsoft/setup-msbuild@v1
5656
- name: Build with Coverity
5757
shell: cmd
58-
run: cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=Release,Platform=x64,BuildMacros=${{ env.BUILD_MACROS }}
58+
run: |
59+
cov-configure --msvc
60+
cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=Release,Platform=x64,BuildMacros=${{ env.BUILD_MACROS }}
5961
- name: Upload Coverity build for analysis
6062
run: |
6163
7z a -r cov-int.zip cov-int

‎.github/workflows/mingw.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929

3030
jobs:
3131
MinGW-Build:
32-
runs-on: windows-2022
32+
runs-on: windows-latest
3333

3434
strategy:
3535
matrix:

‎.github/workflows/vs2022.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929

3030
jobs:
3131
VS2022-Build:
32-
runs-on: windows-2022
32+
runs-on: windows-latest
3333

3434
steps:
3535
- name: Checkout repository

‎examples/wdi-simple.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,4,1,769
11-
PRODUCTVERSION 1,4,1,769
10+
FILEVERSION 1,4,1,770
11+
PRODUCTVERSION 1,4,1,770
1212
FILEFLAGSMASK 0x17L
1313
#ifdef _DEBUG
1414
FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
2525
BEGIN
2626
VALUE "CompanyName", "akeo.ie"
2727
VALUE "FileDescription", "WDI-Simple"
28-
VALUE "FileVersion", "1.4.1.769"
28+
VALUE "FileVersion", "1.4.1.770"
2929
VALUE "InternalName", "WDI-Simple"
3030
VALUE "LegalCopyright", "� 2010-2021 Pete Batard (LGPL v3)"
3131
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html"
3232
VALUE "OriginalFilename", "wdi-simple.exe"
3333
VALUE "ProductName", "WDI-Simple"
34-
VALUE "ProductVersion", "1.4.1.769"
34+
VALUE "ProductVersion", "1.4.1.770"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define FIELD_ORANGE RGB(255,240,200)
6060
#define ARROW_GREEN RGB(92,228,65)
6161
#define ARROW_ORANGE RGB(253,143,56)
62-
#define APP_VERSION "Zadig 2.7.769"
62+
#define APP_VERSION "Zadig 2.7.770"
6363

6464
// These are used to flag end users about the driver they are going to replace
6565
enum driver_type {

‎examples/zadig.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ END
246246
//
247247

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,7,769,0
250-
PRODUCTVERSION 2,7,769,0
249+
FILEVERSION 2,7,770,0
250+
PRODUCTVERSION 2,7,770,0
251251
FILEFLAGSMASK 0x17L
252252
#ifdef _DEBUG
253253
FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
264264
BEGIN
265265
VALUE "CompanyName", "akeo.ie"
266266
VALUE "FileDescription", "Zadig"
267-
VALUE "FileVersion", "2.7.769"
267+
VALUE "FileVersion", "2.7.770"
268268
VALUE "InternalName", "Zadig"
269269
VALUE "LegalCopyright", "� 2010-2021 Pete Batard (GPL v3)"
270270
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
271271
VALUE "OriginalFilename", "zadig.exe"
272272
VALUE "ProductName", "Zadig"
273-
VALUE "ProductVersion", "2.7.769"
273+
VALUE "ProductVersion", "2.7.770"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

‎libwdi/libwdi.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,4,1,769
54-
PRODUCTVERSION 1,4,1,769
53+
FILEVERSION 1,4,1,770
54+
PRODUCTVERSION 1,4,1,770
5555
FILEFLAGSMASK 0x17L
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
6868
BEGIN
6969
VALUE "CompanyName", "akeo.ie"
7070
VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
71-
VALUE "FileVersion", "1.4.1.769"
71+
VALUE "FileVersion", "1.4.1.770"
7272
VALUE "InternalName", "libwdi"
7373
VALUE "LegalCopyright", "� 2010-2022 Pete Batard (LGPL v3)"
7474
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/lesser.html"
7575
VALUE "OriginalFilename", "libwdi"
7676
VALUE "ProductName", "libwdi"
77-
VALUE "ProductVersion", "1.4.1.769"
77+
VALUE "ProductVersion", "1.4.1.770"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

0 commit comments

Comments
 (0)