github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-04-25 20:01:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix latest issues with docker build (and Release+Docker builds) for Medley (#1326)

Browse Source 
* 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
This commit is contained in:
Frank Halasz
2023-09-25 11:34:51 -07:00
committed by GitHub
parent 02665ca91b
commit ebb5c739ea
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/Dockerfile_medley vendored
View File

@@ -57,8 +57,8 @@ RUN apt-get update \
echo "x86_64"; \ echo "x86_64"; \
fi \ fi \
) \ ) \
&& deb="medley-full-${MEDLEY_RELEASE#medley-}" \ && deb="medley-full-linux-${p}-${MEDLEY_RELEASE#medley-}" \
&& deb=${deb}_${MAIKO_RELEASE#maiko-}-linux-${p}.deb \ && deb=${deb}_${MAIKO_RELEASE#maiko-}.deb \
&& apt-get install -y /tmp/${deb} \ && apt-get install -y /tmp/${deb} \
&& chown --recursive root:root /usr/local/interlisp \ && chown --recursive root:root /usr/local/interlisp \
&& (if [ -n "$(which unminimize)" ]; then (yes | unminimize); fi) && (if [ -n "$(which unminimize)" ]; then (yes | unminimize); fi)

4
.github/workflows/buildDocker.yml vendored
View File

@@ -160,7 +160,7 @@ jobs:
- name: Get info about Miako and Medley releases - name: Get info about Miako and Medley releases
id: release_info id: release_info
run: | run: |
regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$" regex="^medley-full-[^-]*-[^-]*-\([^_]*\)_\(.*\).deb\$"
ls -1 release_debs | head -n 1 > debname.tmp ls -1 release_debs | head -n 1 > debname.tmp
medley_release="medley-$(sed -e "s/${regex}/\1/" debname.tmp)" medley_release="medley-$(sed -e "s/${regex}/\1/" debname.tmp)"
maiko_release="maiko-$(sed -e "s/${regex}/\2/" 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 "MEDLEY_RELEASE=${medley_release}" >> ${GITHUB_ENV}
echo "MAIKO_RELEASE=${maiko_release}" >> ${GITHUB_ENV} echo "MAIKO_RELEASE=${maiko_release}" >> ${GITHUB_ENV}
# regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
# Set repo env variables # Set repo env variables
- name: Set repo/docker env variables - name: Set repo/docker env variables
id: repo_env id: repo_env

7
.github/workflows/buildReleaseInclDocker.yml vendored
View File

@@ -95,8 +95,7 @@ jobs:
with: with:
draft: ${{ needs.inputs.outputs.draft }} draft: ${{ needs.inputs.outputs.draft }}
force: ${{ needs.inputs.outputs.force }} force: ${{ needs.inputs.outputs.force }}
secrets: secrets: inherit
OIO_SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
###################################################################################### ######################################################################################
@@ -108,9 +107,7 @@ jobs:
with: with:
draft: ${{ needs.inputs.outputs.draft }} draft: ${{ needs.inputs.outputs.draft }}
force: ${{ needs.inputs.outputs.force }} force: ${{ needs.inputs.outputs.force }}
secrets: secrets: inherit
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
###################################################################################### ######################################################################################