From 0705e2193458ce985c6b7f4ac29a9e971e6a72ad Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Wed, 31 Jan 2024 12:36:19 +0100 Subject: [PATCH 1/5] drop old target, this should not be used anymore --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfb9c1db0..c26ef61b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,6 @@ env: # As defined by the Taskfile's PROJECT_NAME variable PROJECT_NAME: arduino-create-agent TARGET: "/CreateAgent/Stable/" - OLD_TARGET: "/CreateBridge/" # compatibility with older releases (we can't change config.ini) VERSION_TARGET: "arduino-create-static/agent-metadata/" AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -139,7 +138,6 @@ jobs: - name: Upload autoupdate files to Arduino downloads servers run: | aws s3 sync public/ s3://${{ secrets.DOWNLOADS_BUCKET }}${{ env.TARGET }} - aws s3 sync public/ s3://${{ secrets.DOWNLOADS_BUCKET }}${{ env.OLD_TARGET }} if: steps.prerelease.outputs.IS_PRE != 'true' - name: Upload artifacts From ac9b62147db515bba9e802b7f2f2bf4fedf777fb Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Wed, 31 Jan 2024 18:24:19 +0100 Subject: [PATCH 2/5] fix typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c26ef61b5..7c0038414 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -222,7 +222,7 @@ jobs: notarize-macos: name: Notarize bundle - # for not they are exaclty the same + # for now they are exaclty the same strategy: matrix: arch: [amd64, arm64] From 5e0faf3640fa1f4dffddf7f397f3bee99df6b90f Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Wed, 31 Jan 2024 18:24:59 +0100 Subject: [PATCH 3/5] bump installbuilder --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c0038414..99a6bf027 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -354,7 +354,7 @@ jobs: env: # vars used by installbuilder - INSTALLBUILDER_PATH: "/opt/installbuilder-23.7.0/bin/builder" + INSTALLBUILDER_PATH: "/opt/installbuilder-23.11.0/bin/builder" INSTALLER_VARS: "project.outputDirectory=$PWD project.version=${GITHUB_REF##*/} workspace=$PWD realname=Arduino_Create_Agent" # installbuilder will read this vars automatically (defined in installer.xml): INSTALLER_CERT_WINDOWS_PASSWORD: ${{ secrets.INSTALLER_CERT_WINDOWS_PASSWORD }} @@ -383,7 +383,7 @@ jobs: installer-extension: .exe container: - image: floydpink/ubuntu-install-builder:23.7.0 + image: floydpink/ubuntu-install-builder:23.11.0 steps: - name: Checkout From 65e331da464978e60ae2f5f40ea3d809c7ac8343 Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Wed, 31 Jan 2024 18:25:19 +0100 Subject: [PATCH 4/5] bump gon --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99a6bf027..2ce181ea2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -496,7 +496,7 @@ jobs: - name: Install gon for code signing and app notarization run: | - wget -q https://github.com/Bearer/gon/releases/download/v0.0.27/gon_macos.zip + wget -q https://github.com/Bearer/gon/releases/download/v0.0.36/gon_macos.zip unzip gon_macos.zip -d /usr/local/bin - name: Write gon config to file From 64cd675ffa646856a1e811543fc0437355b17bd9 Mon Sep 17 00:00:00 2001 From: Umberto Baldi Date: Wed, 31 Jan 2024 18:30:37 +0100 Subject: [PATCH 5/5] add push to downloads bucket, VERSION_TARGET will be disabled --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2ce181ea2..fbdc2a225 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -610,5 +610,7 @@ jobs: - name: Update version file (used by frontend to trigger autoupdate and create filename) run: | echo {\"Version\": \"${GITHUB_REF##*/}\"} > /tmp/agent-version.json + # TODO remove this when we will have a new frontend aws s3 cp /tmp/agent-version.json s3://${{ env.VERSION_TARGET }} + aws s3 cp /tmp/agent-version.json s3://${{ secrets.DOWNLOADS_BUCKET }}/agent-metadata/ if: ${{ needs.build.outputs.prerelease != 'true' }}