From ebb5c739ea819c32c2b9452f4cdf786ce09cbbe1 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 25 Sep 2023 11:34:51 -0700
Subject: [PATCH] Fix latest issues with docker build (and Release+Docker
 builds) for Medley (#1326)

* fix buildRealeaseInclDocker.yml to pass secrets via inherits rather than explicitly.  Attempt to fix issue with GITHUB_TOEN not being passed to buildRelease.yml

* In buildDocker.yml, fix up calculation of medley and maiko release to accomodate new naming scheme for medley deb files

* Update Dockerfile_medley with new deb file naming convention
---
 .github/workflows/Dockerfile_medley          | 4 ++--
 .github/workflows/buildDocker.yml            | 4 +++-
 .github/workflows/buildReleaseInclDocker.yml | 7 ++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/Dockerfile_medley b/.github/workflows/Dockerfile_medley
index 9f2af48a9..cd78d73b9 100644
--- a/.github/workflows/Dockerfile_medley
+++ b/.github/workflows/Dockerfile_medley
@@ -57,8 +57,8 @@ RUN apt-get update                                               \
                echo "x86_64";                                    \
            fi                                                    \
           )                                                      \
-    && deb="medley-full-${MEDLEY_RELEASE#medley-}"               \
-    && deb=${deb}_${MAIKO_RELEASE#maiko-}-linux-${p}.deb         \
+    && deb="medley-full-linux-${p}-${MEDLEY_RELEASE#medley-}"    \
+    && deb=${deb}_${MAIKO_RELEASE#maiko-}.deb                    \
     && apt-get install -y /tmp/${deb}                            \
     && chown --recursive root:root /usr/local/interlisp          \
     && (if [ -n "$(which unminimize)" ]; then (yes | unminimize); fi)
diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 13fea6185..c7e07ad50 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -160,7 +160,7 @@ jobs:
       - name: Get info about Miako and Medley releases
         id: release_info
         run: |
-          regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+          regex="^medley-full-[^-]*-[^-]*-\([^_]*\)_\(.*\).deb\$"
           ls -1 release_debs | head -n 1 > debname.tmp
           medley_release="medley-$(sed -e "s/${regex}/\1/" debname.tmp)"
           maiko_release="maiko-$(sed -e "s/${regex}/\2/" debname.tmp)"
@@ -168,6 +168,8 @@ jobs:
           echo "MEDLEY_RELEASE=${medley_release}"     >> ${GITHUB_ENV}
           echo "MAIKO_RELEASE=${maiko_release}"       >> ${GITHUB_ENV}
 
+          # regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+
       # Set repo env variables
       - name: Set repo/docker env variables
         id: repo_env
diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 5049109c7..2f108c152 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -95,8 +95,7 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    secrets:
-        OIO_SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
+    secrets: inherit
 
 
 ######################################################################################
@@ -108,9 +107,7 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    secrets:
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    secrets: inherit
 
 ######################################################################################