From 09d53c5df9658946358a9611aaa2acd19a8840e4 Mon Sep 17 00:00:00 2001 From: TMKnight <548588+tmknight@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:10:48 -0400 Subject: [PATCH 1/2] Update github-package-ubuntu.yml --- .github/workflows/github-package-ubuntu.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-package-ubuntu.yml b/.github/workflows/github-package-ubuntu.yml index b34e1fe..da5cdbc 100644 --- a/.github/workflows/github-package-ubuntu.yml +++ b/.github/workflows/github-package-ubuntu.yml @@ -13,7 +13,7 @@ on: release: types: [published] push: - branches: [ "dev-ubuntu" ] + branches: [ "develop", "main" ] paths-ignore: - '.github/**' - '*.md' @@ -86,7 +86,7 @@ jobs: type=ref,event=branch,enable=${{ github.event_name == 'workflow_dispatch' }} type=ref,event=tag type=schedule,pattern=nightly - type=raw,enable=${{ github.event_name == 'schedule' }},value=dev-ubuntu + type=raw,enable=${{ github.event_name == 'schedule' }},value=dev-${{ env.DISTRO }} # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action @@ -117,3 +117,4 @@ jobs: # This step uses the identity token to provision an ephemeral certificate # against the sigstore community Fulcio instance. run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST} + From be41afd0ec7e44d87694355c73fbac1ed4f0bd04 Mon Sep 17 00:00:00 2001 From: tmknight Date: Thu, 20 Jul 2023 08:11:19 -0400 Subject: [PATCH 2/2] Correct CRLF and refine logic test formatting --- scripts/healthcheck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/healthcheck b/scripts/healthcheck index 979813e..2e43f6e 100644 --- a/scripts/healthcheck +++ b/scripts/healthcheck @@ -4,7 +4,7 @@ CODE=99 URI="https://nordvpn.com/wp-admin/admin-ajax.php?action=get_user_info_data" TEST=$(curl -fs "${URI}" | jq .status) || CODE=1 -if [[ "${TEST:-unknown}" != unknown && ${CODE} -eq 99 ]] +if [ "${TEST:-unknown}" != unknown ] && [ ${CODE} -eq 99 ] then CODE=0 else