Fix GitHub Actions workflows

selkies-project · Oct 19, 2023 · 24072ce · 24072ce
1 parent 2d69739
commit 24072ce
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/actions/build_and_publish_image/action.yaml b/.github/actions/build_and_publish_image/action.yaml
@@ -74,7 +74,7 @@ runs:
         fi
 
         if [ '${{ inputs.image_version_2 }}' != '' ]; then
-          export IMAGE_TAG_2="${IMAGE_TAG_URL_PREFIX}${{ inputs.image_name }}:${{ inputs.image_version_2 }}${{ inputs.image_version_suffix }}"
+          export IMAGE_TAG_2="${IMAGE_TAG_URL_PREFIX}${{ inputs.image_name }}:${{ inputs.image_version_2 }}"
           docker tag $IMAGE_TAG_1 $IMAGE_TAG_2
           if [[ "${{ inputs.push_image }}" == "true" ]]; then
             docker push $IMAGE_TAG_2

diff --git a/.github/workflows/build_and_publish_all_images.yaml b/.github/workflows/build_and_publish_all_images.yaml
@@ -41,13 +41,13 @@ jobs:
 
           - name: js-interposer
             version_suffix: -ubuntu20.04
-            build_args: DISTRIB_RELEASE=20.04;DEBFULLNAME="$GITHUB_ACTOR";DEBEMAIL="[email protected]";PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
+            build_args: DISTRIB_RELEASE=20.04;PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
             source_directory: addons/js-interposer
             dockerfile: Dockerfile.ubuntu_debpkg
 
           - name: js-interposer
             version_suffix: -ubuntu22.04
-            build_args: DISTRIB_RELEASE=22.04;DEBFULLNAME="$GITHUB_ACTOR";DEBEMAIL="[email protected]";PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
+            build_args: DISTRIB_RELEASE=22.04;PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
             source_directory: addons/js-interposer
             dockerfile: Dockerfile.ubuntu_debpkg
 

diff --git a/.github/workflows/build_changed_images.yaml b/.github/workflows/build_changed_images.yaml
@@ -49,12 +49,12 @@ jobs:
 
           - name: js-interposer
             version_suffix: -ubuntu20.04
-            build_args: DISTRIB_RELEASE=20.04;DEBFULLNAME="$GITHUB_ACTOR";DEBEMAIL="[email protected]";PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
+            build_args: DISTRIB_RELEASE=20.04;PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
             source_directory: addons/js-interposer
 
           - name: js-interposer
             version_suffix: -ubuntu22.04
-            build_args: DISTRIB_RELEASE=22.04;DEBFULLNAME="$GITHUB_ACTOR";DEBEMAIL="[email protected]";PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
+            build_args: DISTRIB_RELEASE=22.04;PKG_NAME=selkies-js-interposer;PKG_VERSION=0.0.0
             source_directory: addons/js-interposer
 
           - name: infra-gcp-installer
@@ -105,7 +105,7 @@ jobs:
           - name: gst-py-example
             version_suffix: -ubuntu20.04
             push_image: "false"
-            build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr${{ matrix.version_suffix }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr${{ matrix.version_suffix }};JS_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
+            build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=20.04;GSTREAMER_BASE_IMAGE_RELEASE=pr-ubuntu20.04;PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr-ubuntu20.04;WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr-ubuntu20.04;JS_BASE_IMAGE_RELEASE=pr-ubuntu20.04;JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
             dockerfile: Dockerfile.example
             source_directory: .
             source_files_for_diff: |
@@ -120,7 +120,7 @@ jobs:
           - name: gst-py-example
             version_suffix: -ubuntu22.04
             push_image: "false"
-            build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr${{ matrix.version_suffix }};WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr${{ matrix.version_suffix }};JS_BASE_IMAGE_RELEASE=pr${{ matrix.version_suffix }};JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
+            build_args: PACKAGE_VERSION=0.0.0.dev0;UBUNTU_RELEASE=22.04;GSTREAMER_BASE_IMAGE_RELEASE=pr-ubuntu22.04;PY_BUILD_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/py-build:pr-ubuntu22.04;WEB_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/gst-web:pr-ubuntu22.04;JS_BASE_IMAGE_RELEASE=pr-ubuntu22.04;JS_BASE_IMAGE=ghcr.io/selkies-project/selkies-gstreamer/js-interposer
             dockerfile: Dockerfile.example
             source_directory: .
             source_files_for_diff: |

diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -55,13 +55,13 @@ jobs:
 
           - name: js-interposer
             version_suffix: -ubuntu20.04
-            build_args: DISTRIB_RELEASE=20.04;DEBFULLNAME="$GITHUB_ACTOR";DEBEMAIL="[email protected]";PKG_NAME=selkies-js-interposer;PKG_VERSION=${{ needs.get_semver.outputs.semver }}
+            build_args: DISTRIB_RELEASE=20.04;PKG_NAME=selkies-js-interposer;PKG_VERSION=${{ needs.get_semver.outputs.semver }}
             source_directory: addons/js-interposer
             dockerfile: Dockerfile.ubuntu_debpkg
 
           - name: js-interposer
             version_suffix: -ubuntu22.04
-            build_args: DISTRIB_RELEASE=22.04;DEBFULLNAME="$GITHUB_ACTOR";DEBEMAIL="[email protected]";PKG_NAME=selkies-js-interposer;PKG_VERSION=${{ needs.get_semver.outputs.semver }}
+            build_args: DISTRIB_RELEASE=22.04;PKG_NAME=selkies-js-interposer;PKG_VERSION=${{ needs.get_semver.outputs.semver }}
             source_directory: addons/js-interposer
             dockerfile: Dockerfile.ubuntu_debpkg