catch up

costateixeira · Oct 10, 2024 · bad5c9c · bad5c9c
1 parent 2b8a477
commit bad5c9c
Show file tree

Hide file tree

Showing 370 changed files with 26,001 additions and 24,291 deletions.
diff --git a/.github/workflows/linux-docker-build.yml b/.github/workflows/linux-docker-build.yml
@@ -3,20 +3,19 @@ on:
   # but only for the main branch
   push:
     branches:
-      - master
 #  pull_request:
 jobs:
   Build-Docker-Image:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository code
       uses: actions/checkout@v2
-    -
-      name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}      
+#    -
+#      name: Login to Docker Hub
+#      uses: docker/login-action@v2
+#      with:
+#        username: ${{ secrets.DOCKERHUB_USERNAME }}
+#        password: ${{ secrets.DOCKERHUB_TOKEN }}      
     - name: Cache terminology files
       uses: actions/cache@v2
       with:
@@ -64,24 +63,24 @@ jobs:
         mkdir -p ~/terminology/fhir-server
         wget -q --no-clobber https://storage.googleapis.com/ig-build/snomed.test.cache -O ~/terminology/fhir-server/snomed.test.cache || true
         ls  ~/terminology/fhir-server/snomed.test.cache
-    - name: Run tests in docker
+#    - name: Run tests in docker
+#      run: |
+#        docker images --all
+#        docker run \
+#          --network gh \
+#          -v ~/terminology:/terminology \
+#          -v ~/test-settings.ini:/work/fhirserver/exec/64/test-settings.ini \
+#          fhirserver -tests
+
+    - name: Tag and push Docker image
       run: |
-        docker images --all
-        docker run \
-          --network gh \
-          -v ~/terminology:/terminology \
-          -v ~/test-settings.ini:/work/fhirserver/exec/64/test-settings.ini \
-          fhirserver -tests
+        # Extract the FHIR server version from the library/version.inc file
+        FHIR_VERSION=$(grep -oP "FHIR_CODE_FULL_VERSION = '\K[^']+" library/version.inc)
 
-#    - name: Tag and push Docker image
-#      run: |
-#        # Extract the FHIR server version from the library/version.inc file
-#        FHIR_VERSION=$(grep -oP "FHIR_CODE_FULL_VERSION = '\K[^']+" library/version.inc)
-#
-#        # Tag the Docker image with the extracted version and "latest"
-#        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
-#        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
-#
-#        # Push both tagged images to Docker Hub
-#        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
-#        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
+        # Tag the Docker image with the extracted version and "latest"
+        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
+        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
+
+        # Push both tagged images to Docker Hub
+        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
+        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
diff --git a/.gitignore b/.gitignore
@@ -42,7 +42,6 @@ terminology
 # files to ignore
 tests.ini
 exec/fhir.dev.local.cfg
-exec/pack/fhirserver.web
 server/fhirserver.testing.ini
 testcases/v2dict/hl7_94Jul2018.mdb
 testcases/snomed/snomed.cache
@@ -97,3 +96,7 @@ exec/cert/
 *.res
 
 *.fpc
+
+up_props.sh
+
+server/web/fhirserver.web
diff --git a/1-ClickServer/1-ReinstallR4.cmd b/1-ClickServer/1-ReinstallR4.cmd
diff --git a/1-ClickServer/2-RunServer.cmd b/1-ClickServer/2-RunServer.cmd
diff --git a/1-ClickServer/filelist.txt b/1-ClickServer/filelist.txt
diff --git a/1-ClickServer/readme.md b/1-ClickServer/readme.md
diff --git a/1-ClickServer/server/fhirR4.db b/1-ClickServer/server/fhirR4.db
diff --git a/1-ClickServer/server/fhirRx_empty.db b/1-ClickServer/server/fhirRx_empty.db