From 1afb8c4a6267d3dad3294de74166c51981a98b73 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 20 Oct 2024 17:11:17 +0700 Subject: [PATCH] Some additions to the github workflows --- .github/workflows/build.yml | 4 ++++ .github/workflows/dockerprune.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5123cb3..13d3de1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,11 +71,15 @@ jobs: $env:OPENSSL_DIR='D:\\Program Files\OpenSSL\' } + # Set up pkgconfig for gstreamer + $env:PKG_CONFIG_PATH += ';' + $env:GSTREAMER_1_0_ROOT_MSVC_X86_64 + '\lib\pkgconfig' + # Set github vars Add-Content -Path $env:GITHUB_ENV -Value "GSTREAMER_1_0_ROOT_MSVC_X86_64=$env:GSTREAMER_1_0_ROOT_MSVC_X86_64" Add-Content -Path $env:GITHUB_PATH -Value "$env:GSTREAMER_1_0_ROOT_MSVC_X86_64\bin" Add-Content -Path $env:GITHUB_PATH -Value "%GSTREAMER_1_0_ROOT_MSVC_X86_64%\bin" Add-Content -Path $env:GITHUB_ENV -Value "OPENSSL_DIR=$env:OPENSSL_DIR" + Add-Content -Path $env:GITHUB_ENV -Value "PKG_CONFIG_PATH=$env:PKG_CONFIG_PATH" # One last check on directories dir "$env:GSTREAMER_1_0_ROOT_MSVC_X86_64" diff --git a/.github/workflows/dockerprune.yml b/.github/workflows/dockerprune.yml index e0cdd91..222ad8f 100644 --- a/.github/workflows/dockerprune.yml +++ b/.github/workflows/dockerprune.yml @@ -112,7 +112,7 @@ jobs: # build a list of images from tags for j in ${IMAGE_TAGS} do - if [[ "${j}" =~ ^[0-9][.][0-9][.][0-9]$ ]]; then + if [[ "${j}" =~ ^[v]?[0-9][.][0-9][.][0-9]$ ]]; then echo "Version tag (${j}) will not be deleted" continue fi