Skip to content

Commit d742ebf

Browse files
authored
1 parent 2dc755d commit d742ebf

10 files changed

+26
-28
lines changed

.github/workflows/appimage.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: get_message
3131
run: |
3232
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
33-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
3433
build:
3534
needs: check_commit_msg
3635
if: ${{ !contains( needs.check_commit_msg.outputs.commit_message, 'NO_MAIN') }}

.github/workflows/cpack-deb-debian.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: get_message
3131
run: |
3232
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
33-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
3433
linux:
3534
strategy:
3635
fail-fast: false

.github/workflows/cpack-deb-ubuntu.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: get_message
3131
run: |
3232
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
33-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
3433
linux:
3534
strategy:
3635
fail-fast: false
@@ -69,7 +68,7 @@ jobs:
6968
mkdir build
7069
cd build
7170
cmake .. -GNinja -DEMBED_TRANSLATIONS=OFF -DEMBED_DOCS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_DEB=ON -DLEMON_BUILD_INFO="Build for Ubuntu" -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)"
72-
cmake --build . --target package
71+
cmake --build . --target package
7372
- name: Get package name
7473
shell: bash
7574
id: get_package

.github/workflows/cpack-rpm-fedora.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: get_message
3131
run: |
3232
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
33-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
3433
linux:
3534
strategy:
3635
fail-fast: false

.github/workflows/cpack-rpm-opensuse-leap.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: get_message
3131
run: |
3232
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
33-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
3433
linux:
3534
strategy:
3635
fail-fast: false

.github/workflows/cpack-rpm-opensuse-tw.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: get_message
3131
run: |
3232
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
33-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
3433
linux:
3534
strategy:
3635
fail-fast: false

.github/workflows/hashfile.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
jobs:
88
build:
99
runs-on: ubuntu-latest
10-
10+
1111
steps:
12-
- run: echo ::set-env name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
12+
- run: echo "VERSION=\"$(echo $GITHUB_REF | cut -d / -f 3)\"" >> $GITHUB_ENV
1313
shell: bash
14-
- run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}')
14+
- run: echo "REPOSITORY_NAME=\"$(echo \"$GITHUB_REPOSITORY\" | awk -F / '{print $2}')\"" >> $GITHUB_ENV
1515
shell: bash
1616
- name: Checking out sources
1717
uses: actions/checkout@v2

.github/workflows/macos.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: MacOS
2-
on:
2+
on:
33
push:
44
paths-ignore:
55
- 'README.md'
@@ -30,36 +30,41 @@ jobs:
3030
with:
3131
path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
3232
key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
33-
- name: setupQt
34-
if: steps.MacosCacheQt.outputs.cache-hit == 'true'
35-
shell: pwsh
36-
env:
37-
QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
38-
run: |
39-
$qt_Path=${env:QtPath}
40-
echo "::set-env name=Qt5_Dir::$qt_Path"
41-
echo "::add-path::$qt_Path/bin"
33+
# - name: setupQt
34+
# if: steps.MacosCacheQt.outputs.cache-hit == 'true'
35+
# shell: bash
36+
# env:
37+
# QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
38+
# run: |
39+
# qt_Path=${env:QtPath}
40+
# echo "Qt5_DIR=\"$QtPath\"" >> $GITHUB_ENV
41+
# echo "${qt_Path}/bin" >> $GITHUB_PATH
4242
- name: Install Qt
4343
if: steps.MacosCacheQt.outputs.cache-hit != 'true'
4444
uses: jurplel/install-qt-action@v2
4545
with:
4646
version: ${{ matrix.qt_ver }}
47-
47+
4848
- uses: actions/checkout@v2
4949
with:
5050
submodules: true
51-
- name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages
51+
- name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages
5252
run: |
5353
brew install ninja pkg-config
5454
- name: build macos
55+
env:
56+
Qt5_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
5557
run: |
5658
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DLEMON_BUILD_INFO="Build for macOS" -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
5759
cmake --build . --parallel $(sysctl -n hw.logicalcpu)
5860
# tag 打包
5961
- name: package
62+
env:
63+
Qt5_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
6064
run: |
6165
# 拷贝依赖
6266
#mv ${targetName} ${targetName}.app
67+
export PATH=$Qt5_DIR/bin:$PATH
6368
macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
6469
- name: Upload artifact
6570
uses: actions/upload-artifact@v2-preview

.github/workflows/sourcefile.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
id: get_message
1818
run: |
1919
echo "::set-output name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
20-
echo "::set-env name=message::$(git log --format=%B -n 1 ${{ github.event.after }})"
2120
linux:
2221
needs: check_commit_msg
2322
name: All Source Files

.github/workflows/windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Windows
2-
on:
2+
on:
33
# push代码时触发workflow
44
push:
55
# 忽略README.md
@@ -24,7 +24,7 @@ jobs:
2424
qt_version: [5.15.0]
2525
platform: [windows-latest]
2626
arch: [x86, x64]
27-
include:
27+
include:
2828
- platform: windows-latest
2929
arch: x86
3030
qtarch: win32_msvc2019
@@ -56,7 +56,7 @@ jobs:
5656
# =========================================================================================================
5757
- name: Install MSVC compiler
5858
uses: ilammy/msvc-dev-cmd@v1
59-
with:
59+
with:
6060
# 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
6161
toolset: 14.2
6262
arch: ${{ matrix.arch }}
@@ -73,7 +73,7 @@ jobs:
7373
arch: ${{ matrix.qtarch }}
7474
mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
7575
cached: ${{ steps.cache-qt.outputs.cache-hit }}
76-
76+
7777
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Generate Dependencies and Build
7878
shell: bash
7979
env:
@@ -97,7 +97,7 @@ jobs:
9797
Compress-Archive -Path ${env:archiveName} ${env:archiveName}'.zip'
9898
# 记录环境变量packageName给后续step
9999
$name = ${env:archiveName}
100-
echo "::set-env name=packageName::$name"
100+
echo "packageName=\"$name\"" >> $GITHUB_ENV
101101
# 打印环境变量packageName
102102
Write-Host 'packageName:'${env:packageName}
103103
- name: Upload artifact

0 commit comments

Comments
 (0)