Merge branch 'master' into dotnet8

sillsdev · Apr 10, 2024 · 5f8a05c · 5f8a05c
2 parents b3159ad + 94f89f9
commit 5f8a05c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -78,6 +78,7 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.github.com:443
+            cli.codecov.io:443
             codecov.io:443
             github.com:443
             storage.googleapis.com:443
@@ -91,6 +92,7 @@ jobs:
       - name: Upload coverage report
         uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
           files: coverage.cobertura.xml
           flags: backend

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -88,6 +88,7 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.github.com:443
+            cli.codecov.io:443
             codecov.io:443
             github.com:443
             storage.googleapis.com:443
@@ -101,6 +102,7 @@ jobs:
       - name: Upload coverage report
         uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
           files: cobertura-coverage.xml
           flags: frontend

diff --git a/deploy/scripts/install-combine.sh b/deploy/scripts/install-combine.sh
@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -eo pipefail
 
 # Set the environment variables that are required by The Combine.
 # In addition, the values are stored in a file so that they do not
@@ -8,13 +9,6 @@ set-combine-env () {
     # Generate JWT Secret Key
     COMBINE_JWT_SECRET_KEY=`LC_ALL=C tr -dc 'A-Za-z0-9*\-_@!' </dev/urandom | head -c 64; echo`
     # Collect values from user
-    cat << .EOM
-
-     The installation process will setup an initial user as a site
-     administrator.  This you can select a username that you will use
-     for your normal word collection work.  The default username is admin.
-
-.EOM
     read -p "Enter AWS_ACCESS_KEY_ID: " AWS_ACCESS_KEY_ID
     read -p "Enter AWS_SECRET_ACCESS_KEY: " AWS_SECRET_ACCESS_KEY
     # write collected values and static values to config file
@@ -203,11 +197,11 @@ if [ -z "${COMBINE_VERSION}" ] ; then
   exit 1
 fi
 
+create-python-venv
 # Step through the installation stages
 while [ "$STATE" != "Done" ] ; do
   case $STATE in
     Pre-reqs)
-      create-python-venv
       install-kubernetes
       next-state "Restart"
       ;;

diff --git a/deploy/scripts/setup_files/cluster_config.yaml b/deploy/scripts/setup_files/cluster_config.yaml
@@ -30,7 +30,7 @@ nginx-ingress-controller:
     name: ingress-controller
     reference: ingress-nginx/ingress-nginx
     namespace: ingress-nginx
-    wait: false
+    wait: true
 
 rancher-ui:
   repo:

diff --git a/deploy/scripts/uninstall-combine b/deploy/scripts/uninstall-combine
@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -euo pipefail
 
 delete-files () {
   for file in "$@" ; do