From bd343c0abd892b9a2f84ae925c51d70564b61c4d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 17 May 2024 11:45:58 +0200 Subject: [PATCH 1/6] Update linux.yml add self-hosted-Linux-X64 to options --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 08c59c91587..1264fb31415 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -38,6 +38,7 @@ on: type: choice options: - ubuntu-22.04 + - self-hosted-Linux-X64 jobs: linux-installer: From 8d961a58274b58215447c4c46db55df416bd32c4 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 17 May 2024 13:45:59 +0200 Subject: [PATCH 2/6] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1264fb31415..b471881d3bf 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -38,7 +38,7 @@ on: type: choice options: - ubuntu-22.04 - - self-hosted-Linux-X64 + - self-hosted-Ubuntu24-X64 jobs: linux-installer: From 5d7deeb94a0780a3e9e0aaa82aa337abc5d1d6f0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 17 May 2024 14:03:56 +0200 Subject: [PATCH 3/6] change the default to self-hosted change the default to self-hosted --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b471881d3bf..a03be047682 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,7 +34,7 @@ on: operating_system: description: 'OS' required: true - default: 'ubuntu-22.04' + default: 'self-hosted-Ubuntu24-X64' type: choice options: - ubuntu-22.04 From 0912c62b34dd50a5de008c5e3bdd05628ed38368 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 18 May 2024 18:51:32 +0200 Subject: [PATCH 4/6] use branch workflow rather than main for testing --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a03be047682..374348c0dc5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ on: jobs: linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@HellAholic-patch-1 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -50,4 +50,4 @@ jobs: staging: ${{ inputs.staging }} architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} - secrets: inherit \ No newline at end of file + secrets: inherit From 4eceea14029cc06c2f963b3592b231bb46290fa1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 22 May 2024 14:48:10 +0200 Subject: [PATCH 5/6] Update linux.yml --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 374348c0dc5..90f54639396 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,11 +34,11 @@ on: operating_system: description: 'OS' required: true - default: 'self-hosted-Ubuntu24-X64' + default: 'self-hosted-Ubuntu22-X64' type: choice options: - ubuntu-22.04 - - self-hosted-Ubuntu24-X64 + - self-hosted-Ubuntu22-X64 jobs: linux-installer: From b0bd3a2d1f267af77d6baec1cd1114255de68a0e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 22 May 2024 15:36:15 +0200 Subject: [PATCH 6/6] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 90f54639396..f9d800c77d7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ on: jobs: linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@HellAholic-patch-1 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }}