Adding mac back

OHDSI · Sep 8, 2023 · 0ce0c1b · 0ce0c1b
1 parent d57a832
commit 0ce0c1b
Showing 1 changed file with 20 additions and 25 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -4,7 +4,7 @@ jobs:
   default:
     strategy:
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-latest, macos-latest]
         httpType: [http, https]
     runs-on: ${{ matrix.os }}
     steps:
@@ -22,38 +22,33 @@ jobs:
         if: matrix.httpType == 'https' && runner.os == 'macOS'
         run: sed -i '' 's/HTTP_TYPE=\"http\"/HTTP_TYPE=\"https\"/g' .env
       - name: Create and trust self signed certs
-        if: matrix.httpType == 'https' && runner.os == 'Linux'
+        if: matrix.httpType == 'https'
         run: |
           openssl req -x509 -out ./certs/broadsea.crt -keyout ./certs/broadsea.key \
             -newkey rsa:2048 -nodes -sha256 \
             -subj '/CN=127.0.0.1' -extensions EXT -config <( \
             printf "[dn]\nCN=127.0.0.1\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:127.0.0.1\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
-          sudo apt-get install -y ca-certificates
-          sudo cp ./certs/broadsea.crt /usr/local/share/ca-certificates
-          sudo update-ca-certificates
       - name: Build traefik container
         run: docker-compose --env-file .env up -d
-      - name: Build content container
-        run: docker-compose --env-file .env --profile content up -d
-      # - name: Build default profile
-      #   run: docker-compose --env-file .env --profile default up -d
-      # - name: Setup postgres client on Linux
-      #   if: runner.os == 'Linux'
-      #   run: sudo apt-get install --yes --no-install-recommends postgresql-client
-      # - name: Setup postgres client on MacOS
-      #   if: runner.os == 'macOS'
-      #   run: brew install libpq
-      # - name: Test atlasdb
-      #   run: PGPASSWORD=$(cat ./secrets/webapi/WEBAPI_DATASOURCE_PASSWORD) psql -h 127.0.0.1 -p 5432 -U postgres -c "select source_name from webapi.source limit 1"
+      - name: Build default profile
+        run: docker-compose --env-file .env --profile default up -d
+      - name: Setup postgres client on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt-get install --yes --no-install-recommends postgresql-client
+      - name: Setup postgres client on MacOS
+        if: runner.os == 'macOS'
+        run: brew install libpq
+      - name: Test atlasdb
+        run: PGPASSWORD=$(cat ./secrets/webapi/WEBAPI_DATASOURCE_PASSWORD) psql -h 127.0.0.1 -p 5432 -U postgres -c "select source_name from webapi.source limit 1"
       - name: Test traefik container
         run: docker logs traefik
       - name: Test content container
         run: curl -s -k --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1
-      # - name: Test HADES
-      #   run: curl -s --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1/hades/auth-sign-in
-      # - name: Test Atlas
-      #   run: curl -s --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1/atlas/#/home
-      # - name: Test WebAPI info endpoint
-      #   run: |
-      #     sleep 30
-      #     curl -s --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1/WebAPI/info
+      - name: Test HADES
+        run: curl -s -k --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1/hades/auth-sign-in
+      - name: Test Atlas
+        run: curl -s -k --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1/atlas/#/home
+      - name: Test WebAPI info endpoint
+        run: |
+          sleep 30
+          curl -s -k --retry 10 --retry-connrefused ${{matrix.httpType}}://127.0.0.1/WebAPI/info