Skip to content

Commit aa7a9c8

Browse files
committed
Merge branch 'master' into pr/62
2 parents 9d380fe + 226bd1d commit aa7a9c8

File tree

6 files changed

+133
-94
lines changed

6 files changed

+133
-94
lines changed

.github/workflows/build-be.yml

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
- name: Configure paths
1313
run: |
1414
New-Item -ItemType Directory -Force -Path ./artifacts/release/x64
@@ -34,27 +34,33 @@ jobs:
3434
Copy-Item -Path ./assets/windows/doorstop_config.ini -Destination ./artifacts/verbose/x64/doorstop_config.ini
3535
Copy-Item -Path ./assets/windows/doorstop_config.ini -Destination ./artifacts/verbose/x86/doorstop_config.ini
3636
- name: Upload Release
37-
uses: actions/upload-artifact@v2
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: doorstop_win_release
4040
path: artifacts/release
41+
include-hidden-files: true
4142
- name: Upload Verbose
42-
uses: actions/upload-artifact@v2
43+
uses: actions/upload-artifact@v4
4344
with:
4445
name: doorstop_win_verbose
4546
path: artifacts/verbose
47+
include-hidden-files: true
4648

4749
build-linux:
4850
runs-on: ubuntu-latest
51+
container:
52+
image: ubuntu:20.04
53+
env:
54+
XMAKE_ROOT: y
4955

5056
steps:
5157
- name: Checkout
52-
uses: actions/checkout@v2
58+
uses: actions/checkout@v4
5359
- name: Configure paths
5460
run: |
55-
mkdir -p artifacts/{verbose,release,debug}/{x86,x64}
61+
bash -c "mkdir -p artifacts/{verbose,release,debug}/{x86,x64}"
5662
- name: Install dependencies
57-
run: sudo apt-get update && sudo apt-get install -y git build-essential libreadline-dev ccache gcc-multilib g++-multilib
63+
run: apt-get update && apt-get install -y git build-essential libreadline-dev ccache gcc-multilib g++-multilib clang curl
5864
- name: Build Release
5965
run: |
6066
./build.sh
@@ -83,27 +89,30 @@ jobs:
8389
cp assets/nix/run.sh artifacts/debug/x86/run.sh
8490
cp assets/nix/run.sh artifacts/debug/x64/run.sh
8591
- name: Upload Release
86-
uses: actions/upload-artifact@v2
92+
uses: actions/upload-artifact@v4
8793
with:
8894
name: doorstop_linux_release
8995
path: artifacts/release
96+
include-hidden-files: true
9097
- name: Upload Verbose
91-
uses: actions/upload-artifact@v2
98+
uses: actions/upload-artifact@v4
9299
with:
93100
name: doorstop_linux_verbose
94101
path: artifacts/verbose
102+
include-hidden-files: true
95103
- name: Upload Debug
96-
uses: actions/upload-artifact@v2
104+
uses: actions/upload-artifact@v4
97105
with:
98106
name: doorstop_linux_debug
99107
path: artifacts/debug
108+
include-hidden-files: true
100109

101110
build-macos:
102111
runs-on: macos-latest
103112

104113
steps:
105114
- name: Checkout
106-
uses: actions/checkout@v2
115+
uses: actions/checkout@v4
107116
- name: Configure paths
108117
run: |
109118
mkdir -p artifacts/{verbose,release,debug}/universal
@@ -126,20 +135,23 @@ jobs:
126135
cp build/macosx/universal/debug/.doorstop_version artifacts/debug/universal/.doorstop_version
127136
cp assets/nix/run.sh artifacts/debug/universal/run.sh
128137
- name: Upload Release
129-
uses: actions/upload-artifact@v2
138+
uses: actions/upload-artifact@v4
130139
with:
131140
name: doorstop_macos_release
132141
path: artifacts/release
142+
include-hidden-files: true
133143
- name: Upload Verbose
134-
uses: actions/upload-artifact@v2
144+
uses: actions/upload-artifact@v4
135145
with:
136146
name: doorstop_macos_verbose
137147
path: artifacts/verbose
148+
include-hidden-files: true
138149
- name: Upload Debug
139-
uses: actions/upload-artifact@v2
150+
uses: actions/upload-artifact@v4
140151
with:
141152
name: doorstop_macos_debug
142153
path: artifacts/debug
154+
include-hidden-files: true
143155

144156
collect:
145157
runs-on: ubuntu-latest
@@ -151,7 +163,7 @@ jobs:
151163

152164
steps:
153165
- name: Download artifacts
154-
uses: actions/download-artifact@v3.0.0
166+
uses: actions/download-artifact@v4
155167
with:
156168
path: artifacts
157169
- name: Grab version

0 commit comments

Comments
 (0)