Skip to content

Commit 4aecb84

Browse files
committed
Update GitHub actions workflows
1 parent 019a52f commit 4aecb84

File tree

2 files changed

+42
-81
lines changed

2 files changed

+42
-81
lines changed

.github/workflows/build.yml

+41-61
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,26 @@ jobs:
2121
- name: install dependencies
2222
run: |
2323
sudo apt-get update -qq && sudo apt-get -y install \
24-
build-essential \
2524
cmake
26-
25+
2726
- name: Build xeve baseline
2827
run: |
2928
mkdir build
3029
cd build
3130
cmake .. -DSET_PROF=BASE
3231
make
33-
32+
3433
- name: 'Upload executable Artifact'
3534
uses: actions/upload-artifact@v3
3635
with:
37-
name: xeveb_app-linux-artifact
36+
name: xeveb_app-linux
3837
path: build/bin/xeveb_app
3938
retention-days: 5
40-
39+
4140
- name: 'Upload library Artifact'
4241
uses: actions/upload-artifact@v3
4342
with:
44-
name: libxeveb-linux-artifact
43+
name: libxeveb-linux
4544
path: build/lib/
4645
retention-days: 5
4746

@@ -51,104 +50,85 @@ jobs:
5150
- uses: actions/checkout@v3
5251
with:
5352
fetch-depth: 0
54-
53+
5554
- name: install dependencies
5655
run: |
5756
sudo apt-get update -qq && sudo apt-get -y install \
58-
build-essential \
5957
cmake
60-
58+
6159
- name: Build xeve main
6260
run: |
6361
mkdir build
6462
cd build
6563
cmake ..
6664
make
67-
65+
6866
- name: 'Upload executable Artifact'
6967
uses: actions/upload-artifact@v3
7068
with:
71-
name: xeve_app-linux-artifact
69+
name: xeve_app-linux
7270
path: build/bin/xeve_app
7371
retention-days: 5
74-
72+
7573
- name: 'Upload library Artifact'
7674
uses: actions/upload-artifact@v3
7775
with:
78-
name: libxeve-linux-artifact
76+
name: libxeve-linux
7977
path: build/lib/
8078
retention-days: 5
81-
79+
8280
build-baseline-windows:
8381
runs-on: windows-latest
8482
steps:
8583
- uses: actions/checkout@v3
8684
with:
8785
fetch-depth: 0
8886

89-
- name: Set up MinGW
90-
uses: egor-tensin/setup-mingw@v2
91-
with:
92-
platform: x64
93-
94-
- name: Get CMake
95-
uses: jwlawson/[email protected]
96-
9787
- name: Build xeve baseline
9888
run: |
9989
mkdir build
10090
cd build
10191
cmake .. -G "MinGW Makefiles" -DSET_PROF=BASE
10292
make
103-
104-
# TODO: need to check build paths on Windows
105-
# - name: 'Upload executable Artifact'
106-
# uses: actions/upload-artifact@v3
107-
# with:
108-
# name: xeveb_app-windows-artifact
109-
# path: build/bin/xeveb_app
110-
# retention-days: 5
111-
112-
# - name: 'Upload library Artifact'
113-
# uses: actions/upload-artifact@v3
114-
# with:
115-
# name: libxeveb-windows-artifact
116-
# path: build/lib/
117-
# retention-days: 5
93+
94+
- name: 'Upload executable Artifact'
95+
uses: actions/upload-artifact@v3
96+
with:
97+
name: xeveb_app-windows
98+
path: build/bin/xeveb_app.exe
99+
retention-days: 5
100+
101+
- name: 'Upload library Artifacts'
102+
uses: actions/upload-artifact@v3
103+
with:
104+
name: libxeveb-windows
105+
path: build/src_base/libxeveb.*
106+
retention-days: 5
118107

119108
build-main-windows:
120109
runs-on: windows-latest
121110
steps:
122111
- uses: actions/checkout@v3
123112
with:
124113
fetch-depth: 0
125-
126-
- name: Set up MinGW
127-
uses: egor-tensin/setup-mingw@v2
128-
with:
129-
platform: x64
130-
131-
- name: Get CMake
132-
uses: jwlawson/[email protected]
133-
114+
134115
- name: Build xeve main
135116
run: |
136117
mkdir build
137118
cd build
138119
cmake .. -G "MinGW Makefiles"
139120
make
140-
141-
# TODO: need to check build paths on Windows
142-
# - name: 'Upload executable Artifact'
143-
# uses: actions/upload-artifact@v3
144-
# with:
145-
# name: xeve_app-windows-artifact
146-
# path: build/bin/xeve_app
147-
# retention-days: 5
148-
149-
# - name: 'Upload library Artifact'
150-
# uses: actions/upload-artifact@v3
151-
# with:
152-
# name: libxeve-windows-artifact
153-
# path: build/lib/
154-
# retention-days: 5
121+
122+
- name: 'Upload executable Artifact'
123+
uses: actions/upload-artifact@v3
124+
with:
125+
name: xeve_app-windows
126+
path: build/bin/xeve_app.exe
127+
retention-days: 5
128+
129+
- name: 'Upload library Artifacts'
130+
uses: actions/upload-artifact@v3
131+
with:
132+
name: libxeve-windows
133+
path: build/src_main/libxeve.*
134+
retention-days: 5

.github/workflows/release_packages.yml

+1-20
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,7 @@ jobs:
2424
if: ${{matrix.os == 'ubuntu-latest'}}
2525
run: |
2626
sudo apt-get update -qq && sudo apt-get -y install \
27-
build-essential \
2827
cmake
29-
- name: Set up MinGW (Windows)
30-
if: ${{matrix.os == 'windows-latest'}}
31-
uses: egor-tensin/setup-mingw@v2
32-
with:
33-
platform: x64
34-
35-
- name: Get CMake (Windows)
36-
if: ${{matrix.os == 'windows-latest'}}
37-
uses: jwlawson/[email protected]
38-
39-
- name: Install NSIS (Windows)
40-
if: ${{matrix.os == 'windows-latest'}}
41-
run: |
42-
iwr -useb get.scoop.sh -outfile 'install.ps1'
43-
.\install.ps1 -RunAsAdmin
44-
scoop update
45-
scoop bucket add extras
46-
scoop install nsis
4728
4829
- name: Build Linux versions of xeve, generate packages and md5
4930
if: ${{matrix.os == 'ubuntu-latest'}}
@@ -84,7 +65,7 @@ jobs:
8465
retention-days: 7
8566

8667
- name: Upload assets to GitHub Release
87-
uses: xresloader/[email protected].6
68+
uses: xresloader/[email protected].7
8869
env:
8970
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9071
with:

0 commit comments

Comments
 (0)