Merge branch 'master' into separate-build-server

rust-lang · Sep 4, 2022 · 677342c · 677342c
2 parents 7af6fc3 + 1dd73f4
commit 677342c
Show file tree

Hide file tree

Showing 19 changed files with 623 additions and 460 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,15 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  DOCSRS_PREFIX: ignored/cratesfyi-prefix
+  DOCSRS_DATABASE_URL: postgresql://cratesfyi:password@localhost:15432
+  DOCSRS_LOG: docs_rs=debug,rustwide=info
+  AWS_ACCESS_KEY_ID: cratesfyi
+  AWS_SECRET_ACCESS_KEY: secret_key
+  S3_ENDPOINT: http://localhost:9000
+  DOCSRS_INCLUDE_DEFAULT_TARGETS: false
+  DOCSRS_DOCKER_IMAGE: ghcr.io/rust-lang/crates-build-env/linux-micro
+  SENTRY_ENVIRONMENT: dev
 
 jobs:
   build:
@@ -57,7 +66,6 @@ jobs:
       - name: Launch postgres and min.io
         run: |
           cp .env.sample .env
-          . .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
           docker-compose up -d db s3
           # Give the database enough time to start up
@@ -93,7 +101,6 @@ jobs:
       - name: Launch postgres and min.io
         run: |
           cp .env.sample .env
-          . .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
           docker-compose up -d db s3
           # Give the database enough time to start up
@@ -104,13 +111,12 @@ jobs:
       - name: slow tests
         env:
           DOCSRS_INCLUDE_DEFAULT_TARGETS: true
-          DOCSRS_DOCKER_IMAGE: ghcr.io/rust-lang/crates-build-env/linux-micro
         run: |
           for f in ./test-binaries/*; do
             echo "running $f"
             chmod +x $f  # GH action artifacts don't handle permissions
             # run build-tests. Limited to one thread since we don't support parallel builds.
-            $f --ignored --test-threads=1 || exit 1  
+            $f --ignored --test-threads=1 || exit 1
           done
 
       - name: Clean up the database