From 76e46c4ffdf4263a0dfba33a7964cd1952e5ebee Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Mon, 12 Feb 2024 16:11:01 -0500
Subject: [PATCH] fixup gitlab actions?

---
 .github/workflows/main.yml | 14 ++++++--------
 compose/app/Dockerfile     |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2bbf609f..69c65e03 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,12 +21,12 @@ jobs:
     steps:
     - name: Checkout bmds-server
       uses: actions/checkout@v3
-    - name: Checkout bmds@next
+    - name: Checkout bmds@main
       uses: actions/checkout@v3
       with:
         repository: USEPA/bmds-private
         path: venv
-        ref: next
+        ref: main
         token: ${{ secrets.USEPA_BMDS_PRIVATE_PAT }}
     - uses: actions/setup-python@v4
       with:
@@ -55,8 +55,7 @@ jobs:
         export "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib"
         sudo cp vendor/libnlopt.so /usr/local/lib/libnlopt.so.0
         sudo ln -s /lib/x86_64-linux-gnu/libgsl.so /usr/local/lib/libgsl.so.25
-        export "BMD_DLL=$GITHUB_WORKSPACE/venv/bmds/bin/BMDS330/libDRBMD.so"
-        echo $BMD_DLL
+        export "BMD_DLL=$GITHUB_WORKSPACE/venv/bmds/bmdscore.cpython-*-x86_64-linux-gnu.so"
         ldd $BMD_DLL
     - name: lint
       run: |
@@ -141,12 +140,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Checkout bmds@next
+    - name: Checkout bmds@main
       uses: actions/checkout@v3
       with:
         repository: USEPA/bmds-private
         path: venv
-        ref: next
+        ref: main
         token: ${{ secrets.USEPA_BMDS_PRIVATE_PAT }}
     - uses: actions/setup-python@v4
       with:
@@ -176,8 +175,7 @@ jobs:
         export "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib"
         sudo cp vendor/libnlopt.so /usr/local/lib/libnlopt.so.0
         sudo ln -s /lib/x86_64-linux-gnu/libgsl.so /usr/local/lib/libgsl.so.25
-        export "BMD_DLL=$GITHUB_WORKSPACE/venv/bmds/bin/BMDS330/libDRBMD.so"
-        echo $BMD_DLL
+        export "BMD_DLL=$GITHUB_WORKSPACE/venv/bmds/bmdscore.cpython-*-x86_64-linux-gnu.so"
         ldd $BMD_DLL
     # https://github.community/t/how-to-retry-a-failed-step-in-github-actions-workflow/125880
     - name: run integration tests
diff --git a/compose/app/Dockerfile b/compose/app/Dockerfile
index b44fd73c..c48a853a 100644
--- a/compose/app/Dockerfile
+++ b/compose/app/Dockerfile
@@ -42,5 +42,5 @@ USER app
 
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
-RUN ldd /usr/local/lib/python3.11/site-packages/bmds/bmdscore.cpython-311-x86_64-linux-gnu.so && \
+RUN ldd /usr/local/lib/python3.11/site-packages/bmds/bmdscore.cpython-*-x86_64-linux-gnu.so && \
     python /app/test.py