Skip to content

Commit 73cb5d5

Browse files
committed
Revert "try making build closer to jenkins"
This reverts commit f1f5ba4.
1 parent f1f5ba4 commit 73cb5d5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,14 @@ jobs:
133133
docker compose build --quiet
134134
docker compose pull --quiet
135135
docker compose up --wait
136+
docker compose exec db /opt/app/bin/test-nara-db.sh
136137
docker compose exec app rails assets:precompile db:version
137138
docker compose exec -u root app chown -R nara:nara artifacts
138139
139140
- name: Run RSpec
140141
if: ${{ always() }}
141142
run: |
142-
docker compose exec -e RAILS_ENV=test app rake check
143+
docker compose exec -e RAILS_ENV=test app rspec --format progress --format html --out artifacts/rspec.html
143144
144145
- name: Run Rubocop
145146
if: ${{ always() }}

.rspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
--require spec_helper
22
--format progress
3-
--format html
4-
--out artifacts/rspec.html
3+
--format RspecJunitFormatter
4+
--out artifacts/rspec/specs.xml

docker-compose.ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ services:
88
image: ${DOCKER_APP_IMAGE}
99
volumes: !override
1010
- artifacts:/opt/app/artifacts
11-
environment: !reset
1211

1312
volumes:
1413
artifacts:

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
db:
2121
# For local development, set DATABASE_URL=mysql2://root:root@0.0.0.0:33306/NARA
2222
# or use `mysql -u root -proot -h 0.0.0.0 -P 33306 -D NARA`
23-
image: ghcr.io/berkeleylibrary/nara-db:latest
23+
image: ghcr.io/berkeleylibrary/nara-db:AP-499
2424
environment:
2525
# Default password for the image is empty, but adminer doesn't support
2626
# that (https://www.adminer.org/en/password/), so we use 'root'

0 commit comments

Comments
 (0)