Skip to content

Commit 917ff0c

Browse files
committed
Clean up CI build files
Using a script to output the CI .env file seems unnecessary. This just moves it to a 'docker-ci.env' file that the GitHub actions workflow moves to the '.env' file. Also removes the now unneeded (old) Travis-CI build settings script and YAML config file.
1 parent 54e14c4 commit 917ff0c

4 files changed

Lines changed: 6 additions & 60 deletions

File tree

.github/workflows/do-build-and-run-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
steps:
77
- name: check out repository
88
uses: actions/checkout@v4
9-
- name: build CI settings .env
10-
run: ./build_ci_settings.sh
9+
- name: set CI environment variables
10+
run: mv django/sierra/sierra/settings/docker-ci.env django/sierra/sierra/settings/.env
1111
- name: pull external service images via docker-compose
1212
run: |
1313
./docker-compose.sh pull default-db-test sierra-db-test \

.travis.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

build_travis_settings.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

build_ci_settings.sh renamed to django/sierra/sierra/settings/docker-ci.env

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#!/usr/bin/env sh
2-
3-
path_to_settings=django/sierra/sierra/settings/.env
4-
test_settings="SECRET_KEY=\"Some secret key\"
1+
# ci.env -- contains environment variables for testing via CI tools
2+
SECRET_KEY="Some secret key"
53
DJANGO_SETTINGS_MODULE=sierra.settings.test
64
ALLOWED_HOSTS=localhost
75
SIERRA_DB_USER=none
@@ -20,10 +18,5 @@ TIME_ZONE=America/Chicago
2018
EXPORTER_EMAIL_ON_ERROR=false
2119
EXPORTER_EMAIL_ON_WARNING=false
2220
EXPORTER_AUTOMATED_USERNAME=django_admin
23-
EXPORTER_MAX_RC_CONFIG=\"ItemsToSolr:500,ItemsBibsToSolr:500,BibsToSolr:500,BibsAndAttachedToSolr:100\"
24-
EXPORTER_MAX_DC_CONFIG=\"ItemsToSolr:1000,ItemsBibsToSolr:100,BibsToSolr:100,BibsAndAttachedToSolr:100\"
25-
"
26-
27-
echo "$test_settings" > $path_to_settings
28-
echo "Settings file created:"
29-
cat $path_to_settings
21+
EXPORTER_MAX_RC_CONFIG="ItemsToSolr:500,ItemsBibsToSolr:500,BibsToSolr:500,BibsAndAttachedToSolr:100"
22+
EXPORTER_MAX_DC_CONFIG="ItemsToSolr:1000,ItemsBibsToSolr:100,BibsToSolr:100,BibsAndAttachedToSolr:100"

0 commit comments

Comments
 (0)