mirror of
https://github.com/pbatard/rufus.git
synced 2025-05-13 14:44:30 -04:00
[misc] update GitHub Actions scripts
* Closes #2113 * Also fix a broken URL * PS: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ is *WOEFULLY* incomplete, in that it doesn't tell you that: 1. The new method of setting output is *NO LONGER* shell agnostic (i.e *REGRESSION*) 2. You need to use bash for the new $GITHUB_OUTPUT to work
This commit is contained in:
parent
fab095c043
commit
8d04e5f1f4
6 changed files with 21 additions and 13 deletions
2
.github/workflows/codeql.yml
vendored
2
.github/workflows/codeql.yml
vendored
|
@ -28,7 +28,7 @@ jobs:
|
||||||
languages: cpp
|
languages: cpp
|
||||||
|
|
||||||
- name: Add MSBuild to PATH
|
- name: Add MSBuild to PATH
|
||||||
uses: microsoft/setup-msbuild@v1.1
|
uses: microsoft/setup-msbuild@v1
|
||||||
with:
|
with:
|
||||||
msbuild-architecture: x64
|
msbuild-architecture: x64
|
||||||
|
|
||||||
|
|
2
.github/workflows/coverity.yml
vendored
2
.github/workflows/coverity.yml
vendored
|
@ -44,7 +44,7 @@ jobs:
|
||||||
run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH
|
run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Add MSBuild to PATH
|
- name: Add MSBuild to PATH
|
||||||
uses: microsoft/setup-msbuild@v1.1
|
uses: microsoft/setup-msbuild@v1
|
||||||
|
|
||||||
- name: Build with Coverity
|
- name: Build with Coverity
|
||||||
run: |
|
run: |
|
||||||
|
|
8
.github/workflows/mingw.yml
vendored
8
.github/workflows/mingw.yml
vendored
|
@ -60,13 +60,17 @@ jobs:
|
||||||
|
|
||||||
- name: Set ALPHA
|
- name: Set ALPHA
|
||||||
id: set_alpha
|
id: set_alpha
|
||||||
|
shell: bash
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||||
run: echo "::set-output name=option::--enable-alpha"
|
# This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT
|
||||||
|
run: echo "option=--enable-alpha" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Set BETA
|
- name: Set BETA
|
||||||
id: set_beta
|
id: set_beta
|
||||||
|
shell: bash
|
||||||
if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }}
|
if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }}
|
||||||
run: echo "::set-output name=option::--enable-beta"
|
# This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT
|
||||||
|
run: echo "option=--enable-beta" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
|
|
10
.github/workflows/vs2022.yml
vendored
10
.github/workflows/vs2022.yml
vendored
|
@ -45,19 +45,23 @@ jobs:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- name: Add MSBuild to PATH
|
- name: Add MSBuild to PATH
|
||||||
uses: microsoft/setup-msbuild@v1.1
|
uses: microsoft/setup-msbuild@v1
|
||||||
with:
|
with:
|
||||||
msbuild-architecture: x64
|
msbuild-architecture: x64
|
||||||
|
|
||||||
- name: Set ALPHA
|
- name: Set ALPHA
|
||||||
id: set_alpha
|
id: set_alpha
|
||||||
|
shell: bash
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||||
run: echo "::set-output name=option::/DALPHA"
|
# This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT
|
||||||
|
run: echo "option=/DALPHA" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Set BETA
|
- name: Set BETA
|
||||||
id: set_beta
|
id: set_beta
|
||||||
|
shell: bash
|
||||||
if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }}
|
if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }}
|
||||||
run: echo "::set-output name=option::/DBETA"
|
# This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT
|
||||||
|
run: echo "option=/DBETA" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
|
@ -1447,7 +1447,7 @@ DWORD WINAPI FormatThread(void* param)
|
||||||
// Find out if we need to add any extra partitions
|
// Find out if we need to add any extra partitions
|
||||||
if ((windows_to_go) && (target_type == TT_UEFI) && (partition_type == PARTITION_STYLE_GPT))
|
if ((windows_to_go) && (target_type == TT_UEFI) && (partition_type == PARTITION_STYLE_GPT))
|
||||||
// According to Microsoft, every GPT disk (we RUN Windows from) must have an MSR due to not having hidden sectors
|
// According to Microsoft, every GPT disk (we RUN Windows from) must have an MSR due to not having hidden sectors
|
||||||
// http://msdn.microsoft.com/en-us/library/windows/hardware/dn640535.aspx#gpt_faq_what_disk_require_msr
|
// https://learn.microsoft.com/en-us/windows-hardware/manufacture/desktop/windows-and-gpt-faq#disks-that-require-an-msr
|
||||||
extra_partitions = XP_ESP | XP_MSR;
|
extra_partitions = XP_ESP | XP_MSR;
|
||||||
else if ( ((fs_type == FS_NTFS) || (fs_type == FS_EXFAT)) &&
|
else if ( ((fs_type == FS_NTFS) || (fs_type == FS_EXFAT)) &&
|
||||||
((boot_type == BT_UEFI_NTFS) || ((boot_type == BT_IMAGE) && IS_EFI_BOOTABLE(img_report) &&
|
((boot_type == BT_UEFI_NTFS) || ((boot_type == BT_IMAGE) && IS_EFI_BOOTABLE(img_report) &&
|
||||||
|
|
10
src/rufus.rc
10
src/rufus.rc
|
@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||||
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||||
EXSTYLE WS_EX_ACCEPTFILES
|
EXSTYLE WS_EX_ACCEPTFILES
|
||||||
CAPTION "Rufus 3.22.1952"
|
CAPTION "Rufus 3.22.1953"
|
||||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||||
BEGIN
|
BEGIN
|
||||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||||
|
@ -396,8 +396,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 3,22,1952,0
|
FILEVERSION 3,22,1953,0
|
||||||
PRODUCTVERSION 3,22,1952,0
|
PRODUCTVERSION 3,22,1953,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -415,13 +415,13 @@ BEGIN
|
||||||
VALUE "Comments", "https://rufus.ie"
|
VALUE "Comments", "https://rufus.ie"
|
||||||
VALUE "CompanyName", "Akeo Consulting"
|
VALUE "CompanyName", "Akeo Consulting"
|
||||||
VALUE "FileDescription", "Rufus"
|
VALUE "FileDescription", "Rufus"
|
||||||
VALUE "FileVersion", "3.22.1952"
|
VALUE "FileVersion", "3.22.1953"
|
||||||
VALUE "InternalName", "Rufus"
|
VALUE "InternalName", "Rufus"
|
||||||
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
|
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
|
||||||
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||||
VALUE "OriginalFilename", "rufus-3.22.exe"
|
VALUE "OriginalFilename", "rufus-3.22.exe"
|
||||||
VALUE "ProductName", "Rufus"
|
VALUE "ProductName", "Rufus"
|
||||||
VALUE "ProductVersion", "3.22.1952"
|
VALUE "ProductVersion", "3.22.1953"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue