Skip to content

Commit fcca7de

Browse files
awawa-devawawa-dev
committed
Update to version 16
1 parent d1d10c8 commit fcca7de

File tree

130 files changed

+6634
-3260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+6634
-3260
lines changed

‎.ci/ci_build.sh‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,36 @@ echo "Platform: ${PLATFORM}, build type: ${BUILD_TYPE}, CI_NAME: $CI_NAME, docke
2424
# Build the package on osx or linux
2525
if [[ "$CI_NAME" == 'osx' || "$CI_NAME" == 'darwin' ]]; then
2626
echo "Start: osx or darwin"
27-
28-
mkdir build || exit 1
29-
cd build
30-
cmake -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ../ || exit 2
31-
make -j $(sysctl -n hw.ncpu) package || exit 3
32-
exit 0;
33-
exit 1 || { echo "---> Hyperhdr compilation failed! Abort"; exit 5; }
27+
if [[ "$USE_CCACHE" == '1' ]]; then
28+
echo "Using ccache"
29+
30+
# Init ccache
31+
mkdir -p .ccache
32+
cd .ccache
33+
CCACHE_PATH=$PWD
34+
cd ..
35+
cachecommand="-DCMAKE_C_COMPILER_LAUNCHER=ccache"
36+
export CCACHE_DIR=${CCACHE_PATH} && export CCACHE_COMPRESS=true && export CCACHE_COMPRESSLEVEL=6 && export CCACHE_MAXSIZE=400M
37+
echo "CCache parameters: ${cachecommand}"
38+
ls -a .ccache
39+
40+
mkdir build || exit 1
41+
cd build
42+
ccache -p
43+
cmake ${cachecommand} -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ../ || exit 2
44+
make -j $(sysctl -n hw.ncpu) package || exit 3
45+
46+
exit 0;
47+
exit 1 || { echo "---> HyperHDR compilation failed! Abort"; exit 5; }
48+
else
49+
echo "Not using ccache"
50+
mkdir build || exit 1
51+
cd build
52+
cmake -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ../ || exit 2
53+
make -j $(sysctl -n hw.ncpu) package || exit 3
54+
exit 0;
55+
exit 1 || { echo "---> HyperHDR compilation failed! Abort"; exit 5; }
56+
fi
3457
elif [[ $CI_NAME == *"mingw64_nt"* || "$CI_NAME" == 'windows_nt' ]]; then
3558
echo "Start: windows"
3659

‎.github/workflows/cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
uses: kolpav/purge-artifacts-action@v1
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
15-
expire-in: 14days # all artifacts at least 14 days old
15+
expire-in: 28days # all artifacts at least 28 days old

‎.github/workflows/push-master-copy.bak‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,65 @@ jobs:
7878
name: ${{ matrix.dockerImage }}
7979
path: deploy/Hyper*.deb
8080

81+
######################
82+
####### macOS ########
83+
######################
84+
85+
macOS:
86+
name: macOS
87+
runs-on: macos-latest
88+
steps:
89+
# Checkout
90+
- uses: actions/checkout@v1
91+
with:
92+
submodules: true
93+
94+
# Generate cache id
95+
- name: Prepare ccache timestamp
96+
if: env.USE_CACHE == '1'
97+
id: ccache_cache_timestamp
98+
shell: cmake -P {0}
99+
run: |
100+
string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC)
101+
message("::set-output name=timestamp::${current_date}")
102+
103+
# Download cache
104+
- name: ccache cache files
105+
if: env.USE_CACHE == '1'
106+
uses: actions/cache@v1.1.0
107+
with:
108+
path: .ccache
109+
key: macOS-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
110+
restore-keys: macOS-ccache-
111+
112+
# Install deps
113+
- name: Install deps
114+
shell: bash
115+
run: brew update && brew upgrade && brew install qt@5 xz ccache
116+
117+
# Build process
118+
- name: Build packages
119+
env:
120+
PLATFORM: osx
121+
USE_CCACHE: ${{ env.USE_CACHE }}
122+
shell: bash
123+
run: ./.ci/ci_build.sh
124+
125+
# Upload artifacts (only on tagged commit)
126+
- name: Upload artifacts
127+
if: startsWith(github.event.ref, 'refs/tags')
128+
uses: actions/upload-artifact@v2
129+
with:
130+
path: build/Hyper*.dmg
131+
132+
# Upload artifacts from commit
133+
- name: Upload artifacts from commit
134+
if: (startsWith(github.event.ref, 'refs/tags') != true)
135+
uses: actions/upload-artifact@v2
136+
with:
137+
name: macOS_x64
138+
path: build/Hyper*.dmg
139+
81140
######################
82141
###### Windows #######
83142
######################
@@ -87,7 +146,7 @@ jobs:
87146
runs-on: windows-latest
88147
env:
89148
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
90-
QT_VERSION: 5.15.0
149+
QT_VERSION: 5.15.2
91150
steps:
92151
- name: Checkout
93152
uses: actions/checkout@v1
@@ -142,7 +201,7 @@ jobs:
142201
publish:
143202
name: Publish Releases
144203
if: startsWith(github.event.ref, 'refs/tags')
145-
needs: [Linux, windows]
204+
needs: [Linux, windows, macOS]
146205
runs-on: ubuntu-20.04
147206
steps:
148207
- name: Checkout

‎.github/workflows/push-master.yml‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,65 @@ jobs:
7878
name: ${{ matrix.dockerImage }}
7979
path: deploy/Hyper*.deb
8080

81+
######################
82+
####### macOS ########
83+
######################
84+
85+
macOS:
86+
name: macOS
87+
runs-on: macos-latest
88+
steps:
89+
# Checkout
90+
- uses: actions/checkout@v1
91+
with:
92+
submodules: true
93+
94+
# Generate cache id
95+
- name: Prepare ccache timestamp
96+
if: env.USE_CACHE == '1'
97+
id: ccache_cache_timestamp
98+
shell: cmake -P {0}
99+
run: |
100+
string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC)
101+
message("::set-output name=timestamp::${current_date}")
102+
103+
# Download cache
104+
- name: ccache cache files
105+
if: env.USE_CACHE == '1'
106+
uses: actions/cache@v1.1.0
107+
with:
108+
path: .ccache
109+
key: macOS-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
110+
restore-keys: macOS-ccache-
111+
112+
# Install deps
113+
- name: Install deps
114+
shell: bash
115+
run: brew update && brew upgrade && brew install qt@5 xz ccache
116+
117+
# Build process
118+
- name: Build packages
119+
env:
120+
PLATFORM: osx
121+
USE_CCACHE: ${{ env.USE_CACHE }}
122+
shell: bash
123+
run: ./.ci/ci_build.sh
124+
125+
# Upload artifacts (only on tagged commit)
126+
- name: Upload artifacts
127+
if: startsWith(github.event.ref, 'refs/tags')
128+
uses: actions/upload-artifact@v2
129+
with:
130+
path: build/Hyper*.dmg
131+
132+
# Upload artifacts from commit
133+
- name: Upload artifacts from commit
134+
if: (startsWith(github.event.ref, 'refs/tags') != true)
135+
uses: actions/upload-artifact@v2
136+
with:
137+
name: macOS_x64
138+
path: build/Hyper*.dmg
139+
81140
######################
82141
###### Windows #######
83142
######################
@@ -87,7 +146,7 @@ jobs:
87146
runs-on: windows-latest
88147
env:
89148
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
90-
QT_VERSION: 5.15.0
149+
QT_VERSION: 5.15.2
91150
steps:
92151
- name: Checkout
93152
uses: actions/checkout@v1
@@ -142,7 +201,7 @@ jobs:
142201
publish:
143202
name: Publish Releases
144203
if: startsWith(github.event.ref, 'refs/tags')
145-
needs: [Linux, windows]
204+
needs: [Linux, windows, macOS]
146205
runs-on: ubuntu-20.04
147206
steps:
148207
- name: Checkout

0 commit comments

Comments
 (0)