From b771d4a4673edcd5014da42a5390c115631014e8 Mon Sep 17 00:00:00 2001 From: Ryan Parman Date: Sat, 27 Apr 2024 01:12:25 -0600 Subject: [PATCH] Fix tenv metapackages. --- .github/workflows/_build-and-cache-by-platform.yml | 2 +- installer/ubuntu.sh | 2 ++ packages/opentofu/postinstall.sh | 2 +- packages/terraform/postinstall.sh | 2 +- packages/terragrunt/postinstall.sh | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_build-and-cache-by-platform.yml b/.github/workflows/_build-and-cache-by-platform.yml index cdfbb57..14c751d 100644 --- a/.github/workflows/_build-and-cache-by-platform.yml +++ b/.github/workflows/_build-and-cache-by-platform.yml @@ -52,7 +52,7 @@ jobs: options: --privileged steps: - - name: Check to see if we've already built this version + - name: Check to see if we've already built this part of the build matrix uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: check with: diff --git a/installer/ubuntu.sh b/installer/ubuntu.sh index 499c33d..a42c7f1 100644 --- a/installer/ubuntu.sh +++ b/installer/ubuntu.sh @@ -23,6 +23,8 @@ gpg --output /etc/apt/trusted.gpg.d/northwood-labs.asc \ RELEASE="$(lsb_release -cs)" mkdir -p /etc/apt/sources.list.d cat </etc/apt/sources.list.d/northwood-labs.list +# deb https://pkg.northwood-labs.com/apt ${RELEASE} main +# deb https://pkg.northwood-labs.com/apt ${RELEASE} ${RELEASE} deb https://nwlabs-381491855445-package-builder.s3.amazonaws.com/apt ${RELEASE} main deb https://nwlabs-381491855445-package-builder.s3.amazonaws.com/apt ${RELEASE} ${RELEASE} EOF diff --git a/packages/opentofu/postinstall.sh b/packages/opentofu/postinstall.sh index 8788cfc..b2621c3 100644 --- a/packages/opentofu/postinstall.sh +++ b/packages/opentofu/postinstall.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -euo pipefail -/usr/local/bin/tofu +/usr/local/bin/tofu || true diff --git a/packages/terraform/postinstall.sh b/packages/terraform/postinstall.sh index 6c58d6f..3c64424 100644 --- a/packages/terraform/postinstall.sh +++ b/packages/terraform/postinstall.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -euo pipefail -/usr/local/bin/terraform +/usr/local/bin/terraform || true diff --git a/packages/terragrunt/postinstall.sh b/packages/terragrunt/postinstall.sh index e41f5a8..8ae0c1a 100644 --- a/packages/terragrunt/postinstall.sh +++ b/packages/terragrunt/postinstall.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -euo pipefail -/usr/local/bin/terragrunt +/usr/local/bin/terragrunt || true