Skip to content

Commit 677342c

Browse files
authored
Merge branch 'master' into separate-build-server
2 parents 7af6fc3 + 1dd73f4 commit 677342c

File tree

19 files changed

+623
-460
lines changed

19 files changed

+623
-460
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ on:
88

99
env:
1010
RUST_BACKTRACE: 1
11+
DOCSRS_PREFIX: ignored/cratesfyi-prefix
12+
DOCSRS_DATABASE_URL: postgresql://cratesfyi:password@localhost:15432
13+
DOCSRS_LOG: docs_rs=debug,rustwide=info
14+
AWS_ACCESS_KEY_ID: cratesfyi
15+
AWS_SECRET_ACCESS_KEY: secret_key
16+
S3_ENDPOINT: http://localhost:9000
17+
DOCSRS_INCLUDE_DEFAULT_TARGETS: false
18+
DOCSRS_DOCKER_IMAGE: ghcr.io/rust-lang/crates-build-env/linux-micro
19+
SENTRY_ENVIRONMENT: dev
1120

1221
jobs:
1322
build:
@@ -57,7 +66,6 @@ jobs:
5766
- name: Launch postgres and min.io
5867
run: |
5968
cp .env.sample .env
60-
. .env
6169
mkdir -p ${DOCSRS_PREFIX}/public-html
6270
docker-compose up -d db s3
6371
# Give the database enough time to start up
@@ -93,7 +101,6 @@ jobs:
93101
- name: Launch postgres and min.io
94102
run: |
95103
cp .env.sample .env
96-
. .env
97104
mkdir -p ${DOCSRS_PREFIX}/public-html
98105
docker-compose up -d db s3
99106
# Give the database enough time to start up
@@ -104,13 +111,12 @@ jobs:
104111
- name: slow tests
105112
env:
106113
DOCSRS_INCLUDE_DEFAULT_TARGETS: true
107-
DOCSRS_DOCKER_IMAGE: ghcr.io/rust-lang/crates-build-env/linux-micro
108114
run: |
109115
for f in ./test-binaries/*; do
110116
echo "running $f"
111117
chmod +x $f # GH action artifacts don't handle permissions
112118
# run build-tests. Limited to one thread since we don't support parallel builds.
113-
$f --ignored --test-threads=1 || exit 1
119+
$f --ignored --test-threads=1 || exit 1
114120
done
115121
116122
- name: Clean up the database

0 commit comments

Comments
 (0)