-
-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dx_multi_monior_support
- Loading branch information
Showing
77 changed files
with
4,944 additions
and
1,622 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ jobs: | |
sudo apt install coreutils p7zip-full qemu-user-static xz-utils | ||
- name: Checkout CustomPiOS | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].2 | ||
with: | ||
repository: 'guysoft/CustomPiOS' | ||
ref: '${{ github.event.inputs.tagCustomPiOS }}' | ||
|
@@ -99,7 +99,7 @@ jobs: | |
echo "image=$IMAGE" >> $GITHUB_OUTPUT | ||
# artifact upload will take care of zipping for us | ||
- uses: actions/[email protected].0 | ||
- uses: actions/[email protected].3 | ||
with: | ||
name: ${{ steps.copy.outputs.image }} | ||
path: ${{ steps.copy.outputs.image }}.img.xz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,7 +38,7 @@ jobs: | |
sudo apt install coreutils p7zip-full qemu-user-static | ||
- name: Checkout CustomPiOS | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].2 | ||
with: | ||
repository: 'guysoft/CustomPiOS' | ||
path: CustomPiOS | ||
|
@@ -121,7 +121,7 @@ jobs: | |
echo "image=$IMAGE" >> $GITHUB_OUTPUT | ||
# artifact upload will take care of zipping for us | ||
- uses: actions/[email protected].0 | ||
- uses: actions/[email protected].3 | ||
with: | ||
name: ${{ steps.copy.outputs.image }} | ||
path: ${{ steps.copy.outputs.image }}.img |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,7 +67,7 @@ jobs: | |
platform: linux | ||
steps: | ||
# checkout | ||
- uses: actions/[email protected].0 | ||
- uses: actions/[email protected].2 | ||
with: | ||
submodules: true | ||
|
||
|
@@ -83,7 +83,7 @@ jobs: | |
# download cache | ||
- name: Download ccache files | ||
if: env.USE_CACHE == 'true' | ||
uses: actions/cache@v4.0.2 | ||
uses: actions/cache@v4.1.2 | ||
with: | ||
path: .ccache | ||
key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} | ||
|
@@ -115,15 +115,15 @@ jobs: | |
# Upload artifacts (only on tagged commit) | ||
- name: Upload artifacts | ||
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request' | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: release-artifact-${{ matrix.linuxVersion }}-${{ matrix.dockerImage }} | ||
path: deploy/Hyper* | ||
|
||
# Upload artifacts from commit | ||
- name: Upload artifacts from commit | ||
if: (startsWith(github.event.ref, 'refs/tags') != true) && github.event_name != 'pull_request' | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: Linux-${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-installer | ||
path: | | ||
|
@@ -151,7 +151,7 @@ jobs: | |
NICE_NAME: x64 | ||
steps: | ||
# Checkout | ||
- uses: actions/[email protected].0 | ||
- uses: actions/[email protected].2 | ||
with: | ||
submodules: true | ||
|
||
|
@@ -167,7 +167,7 @@ jobs: | |
# Download cache | ||
- name: Download ccache files | ||
if: env.USE_CACHE == 'true' | ||
uses: actions/cache@v4.0.2 | ||
uses: actions/cache@v4.1.2 | ||
with: | ||
path: build/.ccache | ||
key: macOS-ccache-${{ matrix.NICE_NAME }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }} | ||
|
@@ -204,15 +204,15 @@ jobs: | |
# Upload artifacts (only on tagged commit) | ||
- name: Upload artifacts | ||
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request' | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: release-artifact-${{ matrix.JOB_RUNNER }} | ||
path: build/Hyper*.dmg | ||
|
||
# Upload artifacts from commit | ||
- name: Upload artifacts from commit | ||
if: (startsWith(github.event.ref, 'refs/tags') != true) && github.event_name != 'pull_request' | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: Apple_macOS_${{ matrix.NICE_NAME }}_DMG_installer | ||
path: build/Hyper*.dmg | ||
|
@@ -229,12 +229,12 @@ jobs: | |
QT_VERSION: 6.5.3 | ||
steps: | ||
- name: Checkout | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].2 | ||
with: | ||
submodules: true | ||
|
||
- name: Cache Qt | ||
uses: actions/cache@v4.0.2 | ||
uses: actions/cache@v4.1.2 | ||
id: cache-qt-windows | ||
with: | ||
path: ${{ runner.workspace }}/Qt | ||
|
@@ -258,7 +258,7 @@ jobs: | |
# Download cache | ||
- name: Download ccache files | ||
if: env.USE_CACHE == 'true' | ||
uses: actions/cache@v4.0.2 | ||
uses: actions/cache@v4.1.2 | ||
with: | ||
path: build/.ccache | ||
key: ${{ runner.os }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} | ||
|
@@ -303,15 +303,15 @@ jobs: | |
# Upload artifacts (only on tagged commit) | ||
- name: Upload artifacts | ||
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request' | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: release-artifact-windows | ||
path: build/Hyper* | ||
|
||
# Upload artifacts from commit | ||
- name: Upload artifacts from commit | ||
if: (startsWith(github.event.ref, 'refs/tags') != true) && github.event_name != 'pull_request' | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: Windows_x64_setup | ||
path: build/Hyper*.exe | ||
|
@@ -337,7 +337,7 @@ jobs: | |
|
||
steps: | ||
- name: Checkout repository | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].2 | ||
if: env.USE_CODEQL == 'true' | ||
with: | ||
submodules: true | ||
|
@@ -361,7 +361,7 @@ jobs: | |
contents: write | ||
steps: | ||
- name: Checkout | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].2 | ||
|
||
# generate environment variables | ||
- name: Generate environment variables from version and tag | ||
|
@@ -385,7 +385,7 @@ jobs: | |
|
||
# create draft release and upload artifacts | ||
- name: Create draft release | ||
uses: softprops/[email protected].8 | ||
uses: softprops/[email protected].9 | ||
with: | ||
name: HyperHDR ${{ env.VERSION }} | ||
tag_name: ${{ env.TAG }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,7 +62,7 @@ jobs: | |
|
||
steps: | ||
# checkout | ||
- uses: actions/[email protected].0 | ||
- uses: actions/[email protected].2 | ||
with: | ||
submodules: true | ||
|
||
|
@@ -78,7 +78,7 @@ jobs: | |
# download cache | ||
- name: ccache cache files | ||
if: ( env.USE_CACHE == '1' ) | ||
uses: actions/cache@v4.0.2 | ||
uses: actions/cache@v4.1.2 | ||
with: | ||
path: .ccache | ||
key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} | ||
|
@@ -112,7 +112,7 @@ jobs: | |
rm -r repo/pool/ArchLinux ||: | ||
- name: Upload artifacts from commit | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: release-artifact-${{ matrix.linuxVersion }}-${{ matrix.dockerImage }} | ||
path: repo | ||
|
@@ -124,7 +124,7 @@ jobs: | |
|
||
steps: | ||
# Download artifacts from previous build process | ||
- uses: actions/[email protected].0 | ||
- uses: actions/[email protected].2 | ||
with: | ||
submodules: false | ||
- name: Download artifacts | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.