File tree 3 files changed +19
-12
lines changed
3 files changed +19
-12
lines changed Original file line number Diff line number Diff line change @@ -131,12 +131,13 @@ jobs:
131
131
needs : build
132
132
steps :
133
133
- uses : actions/checkout@v4
134
+ - id : install
135
+ run : |
136
+ rustup override set stable
137
+ rustup update stable
134
138
135
- - name : get test binaries from cache
136
- uses : actions/download-artifact@v3
137
- with :
138
- name : test-binaries-${{ github.sha }}
139
- path : ./test-binaries/
139
+ - name : restore build & cargo cache
140
+ uses : Swatinem/rust-cache@v2
140
141
141
142
- name : Launch postgres and min.io
142
143
run : |
Original file line number Diff line number Diff line change @@ -5,12 +5,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
5
5
build-essential git curl cmake gcc g++ pkg-config libmagic-dev \
6
6
libssl-dev zlib1g-dev ca-certificates
7
7
8
- # Install the stable toolchain with rustup
9
- RUN curl https://sh.rustup.rs >/tmp/rustup-init && \
10
- chmod +x /tmp/rustup-init && \
11
- /tmp/rustup-init -y --no-modify-path --default-toolchain stable --profile minimal
12
- ENV PATH=/root/.cargo/bin:$PATH
13
-
14
8
RUN apt-get update && apt-get install -y \
15
9
ca-certificates \
16
10
curl \
Original file line number Diff line number Diff line change @@ -7,18 +7,30 @@ docker-compose stop web
7
7
8
8
docker-compose up -d db s3
9
9
10
+ # If we have a .env file, we need to temporarily move it so
11
+ # it doesn't make sqlx fail compilation.
12
+ if [ -f .env ]; then
13
+ mv .env .tmp.env
14
+ fi
15
+
10
16
# We add the information we need.
11
17
cargo run -- database migrate
18
+ cargo run -- build update-toolchain
12
19
cargo run -- build crate sysinfo 0.23.4
13
20
cargo run -- build crate sysinfo 0.23.5
14
21
cargo run -- build add-essential-files
15
22
23
+ if [ -f .tmp.env ]; then
24
+ mv .tmp.env .env
25
+ fi
26
+
16
27
# In case we don't have a `.env`, we create one.
17
28
if [ ! -f .env ]; then
18
- cp .env.sample .env
29
+ cp .env.sample .env
19
30
fi
20
31
21
32
. .env
33
+
22
34
cargo run -- start-web-server &
23
35
SERVER_PID=$!
24
36
You can’t perform that action at this time.
0 commit comments