Skip to content

Commit 50b01a7

Browse files
committed
CI: Update to Github Actions actions with glob support
1 parent 6b54799 commit 50b01a7

1 file changed

Lines changed: 11 additions & 41 deletions

File tree

.github/workflows/cppcmake.yml

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -76,55 +76,27 @@ jobs:
7676
- name: Package
7777
run: cmake --build build --config Release -j --target package
7878

79-
# TODO: upload-artifact@v2 (in-progress) will support file glob
80-
- name: Upload Artifacts (ubuntu)
81-
if: matrix.os == 'ubuntu-latest'
82-
uses: actions/upload-artifact@master
83-
with:
84-
name: pkg-${{ matrix.os }}
85-
path: build/AppTemplate_cpp_qt-1.13.0-Linux64-bionic.deb
86-
87-
- name: Upload Artifacts (macOS)
88-
if: matrix.os == 'macOS-latest'
89-
uses: actions/upload-artifact@master
90-
with:
91-
name: pkg-${{ matrix.os }}
92-
path: build/AppTemplate_cpp_qt-1.13.0-OSX64.tar.bz2
93-
9479
# TODO: Can reconstruct filename from project name and version in CMakeCache.txt using powershell:
9580
# Select-String -Path build\CMakeCache.txt -Pattern "CMAKE_PROJECT_NAME:STATIC=(.*)" | % { $_.matches.groups[1] } | % {$_.Value}
9681
# Select-String -Path build\CMakeCache.txt -Pattern "CMAKE_PROJECT_VERSION:STATIC=(.*)" | % { $_.matches.groups[1] } | % {$_.Value}
97-
- name: Upload Artifacts (windows)
98-
if: matrix.os == 'windows-latest'
99-
uses: actions/upload-artifact@master
82+
- name: Upload Artifacts
83+
uses: actions/upload-artifact@v2
10084
with:
10185
name: pkg-${{ matrix.os }}
102-
path: build/AppTemplate_cpp_qt-1.13.0-Win64.zip
86+
path: |
87+
build/*.deb
88+
build/*.tar.bz2
89+
build/*.zip
10390
10491
release:
10592
needs: build
10693
runs-on: ubuntu-latest
10794
steps:
10895

109-
# TODO: download-artifact@v2 will support multiple download
110-
- name: Download Artifact (ubuntu)
96+
- name: Download Artifact
11197
if: startsWith(github.ref, 'refs/tags/')
112-
uses: actions/download-artifact@v1
113-
with:
114-
name: pkg-ubuntu-latest
115-
116-
- name: Download Artifact (windows)
117-
if: startsWith(github.ref, 'refs/tags/')
118-
uses: actions/download-artifact@v1
119-
with:
120-
name: pkg-windows-latest
121-
122-
- name: Download Artifact (macOS)
123-
if: startsWith(github.ref, 'refs/tags/')
124-
uses: actions/download-artifact@v1
125-
with:
126-
name: pkg-macOS-latest
127-
98+
uses: actions/download-artifact@v2
99+
128100
- name: Create Release
129101
if: startsWith(github.ref, 'refs/tags/')
130102
id: create_release
@@ -137,7 +109,5 @@ jobs:
137109
draft: false
138110
prerelease: false
139111
# body_path: CHANGELOG.txt
140-
files: |
141-
pkg-ubuntu-latest/AppTemplate_cpp_qt-1.13.0-Linux64-bionic.deb
142-
pkg-macOS-latest/AppTemplate_cpp_qt-1.13.0-OSX64.tar.bz2
143-
pkg-windows-latest/AppTemplate_cpp_qt-1.13.0-Win64.zip
112+
files: 'pkg-*/*'
113+

0 commit comments

Comments
 (0)