From 6050c26d0362767684827221f3259e289e1bb197 Mon Sep 17 00:00:00 2001 From: Ben Pearce Date: Thu, 11 May 2023 09:57:14 +1000 Subject: [PATCH 1/5] fixed oldoldstable-slim package sources --- BuildAssets/test-linux-package.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/BuildAssets/test-linux-package.sh b/BuildAssets/test-linux-package.sh index 531511531e..64015e00e2 100755 --- a/BuildAssets/test-linux-package.sh +++ b/BuildAssets/test-linux-package.sh @@ -15,6 +15,14 @@ if [[ "$OSRELID" == "rhel" && ( -z "$REDHAT_SUBSCRIPTION_USERNAME" || -z "$REDHA exit 1 fi +if [[ "$OSRELID" == "debian" ]]; then + OSRELVERSIONID="$(. /etc/os-release && echo $VERSION_ID)" + if [[ "$OSRELVERSIONID" == "9" ]]; then + # from https://unix.stackexchange.com/a/743865 + echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list + fi +fi + # Install the package (with any needed docker config, system registration, dependencies) using a script from 'linux-package-feeds'. bash ./install-linux-package.sh || exit @@ -38,7 +46,6 @@ if [[ "$OSRELID" == "fedora" ]]; then export DOTNET_BUNDLE_EXTRACT_BASE_DIR=$(pwd)/dotnet-extraction-dir fi - echo Testing octo. octo version || exit OCTO_RESULT="$(octo list-environments --space="$OCTOPUS_SPACE")" || { echo "$OCTO_RESULT"; exit 1; } From a9bd06482280c93583332869cc9126e0131e94f6 Mon Sep 17 00:00:00 2001 From: Ben Pearce Date: Thu, 11 May 2023 10:08:44 +1000 Subject: [PATCH 2/5] remove set-output from actions --- .github/workflows/build.yml | 4 ++-- build/Build.cs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad464c6d84..ec808ddce4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: TAG="octopusdeploy/octo-prerelease:${VERSION}-${PLATFORM}" LATEST="octopusdeploy/octo-prerelease:latest-${PLATFORM}" - echo "::set-output name=DOCKER_IMAGE_TAG::${TAG}" + echo "DOCKER_IMAGE_TAG=${TAG}" >> $GITHUB_OUTPUT docker build \ --build-arg OCTO_TOOLS_VERSION=${VERSION} \ @@ -274,7 +274,7 @@ jobs: echo "::debug::${{github.event_name}}" OUTPUT_FILE="release_notes.txt" jq --raw-output '.release.body' ${{ github.event_path }} | sed 's#\r# #g' > $OUTPUT_FILE - echo "::set-output name=release-note-file::$OUTPUT_FILE" + echo "release-note-file=$OUTPUT_FILE" >> $GITHUB_OUTPUT - name: Create a release in Octopus Deploy 🐙 uses: OctopusDeploy/create-release-action@v3 diff --git a/build/Build.cs b/build/Build.cs index fb66f82020..58fcdbfb15 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -124,7 +124,11 @@ class Build : NukeBuild File.WriteAllText(octoVersionText, fullSemVer); Console.WriteLine($"##[notice]Release version number: {fullSemVer}"); - Console.WriteLine($"::set-output name=version::{fullSemVer}"); + var outputFile = Environment.GetEnvironmentVariable("GITHUB_OUTPUT"); + if (outputFile != null) { + File.AppendAllLines(outputFile, new [] {$"version={fullSemVer}"}); + } + }); Target Compile => _ => _ From 7f44633b4ac6054f16d039fe3fa8c19599573f10 Mon Sep 17 00:00:00 2001 From: Ben Pearce Date: Thu, 11 May 2023 10:12:27 +1000 Subject: [PATCH 3/5] remove debian oldoldstable-slim --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec808ddce4..bd6ea42741 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,7 @@ jobs: distro: [ 'debian:stable-slim', 'debian:oldstable-slim', - 'debian:oldoldstable-slim', + #'debian:oldoldstable-slim', 'ubuntu:latest', 'ubuntu:focal', 'ubuntu:bionic', From fcb7cf3ced48e634f02c3ecdcaaa684b34a95a3a Mon Sep 17 00:00:00 2001 From: Ben Pearce Date: Thu, 11 May 2023 11:41:16 +1000 Subject: [PATCH 4/5] Update .github/workflows/build.yml Co-authored-by: Matt Richardson --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd6ea42741..64e4acf638 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,6 @@ jobs: distro: [ 'debian:stable-slim', 'debian:oldstable-slim', - #'debian:oldoldstable-slim', 'ubuntu:latest', 'ubuntu:focal', 'ubuntu:bionic', From 5755996e68eea62f7107a3fbf53c120b27fbbb49 Mon Sep 17 00:00:00 2001 From: Ben Pearce Date: Thu, 11 May 2023 11:41:22 +1000 Subject: [PATCH 5/5] Update BuildAssets/test-linux-package.sh Co-authored-by: Matt Richardson --- BuildAssets/test-linux-package.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/BuildAssets/test-linux-package.sh b/BuildAssets/test-linux-package.sh index 64015e00e2..735832fb07 100755 --- a/BuildAssets/test-linux-package.sh +++ b/BuildAssets/test-linux-package.sh @@ -15,13 +15,6 @@ if [[ "$OSRELID" == "rhel" && ( -z "$REDHAT_SUBSCRIPTION_USERNAME" || -z "$REDHA exit 1 fi -if [[ "$OSRELID" == "debian" ]]; then - OSRELVERSIONID="$(. /etc/os-release && echo $VERSION_ID)" - if [[ "$OSRELVERSIONID" == "9" ]]; then - # from https://unix.stackexchange.com/a/743865 - echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list - fi -fi # Install the package (with any needed docker config, system registration, dependencies) using a script from 'linux-package-feeds'.