From 624c82b953963a0bd14345760c8277df606e23b8 Mon Sep 17 00:00:00 2001 From: Otto Bittner Date: Wed, 21 Dec 2022 11:19:59 +0100 Subject: [PATCH] y u no save on search+replace?! --- .github/actions/os_build_variables/action.yml | 22 ++++++++--------- .github/workflows/build-os-image.yml | 24 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/actions/os_build_variables/action.yml b/.github/actions/os_build_variables/action.yml index 8e6c43f2b..dc7d9812a 100644 --- a/.github/actions/os_build_variables/action.yml +++ b/.github/actions/os_build_variables/action.yml @@ -165,9 +165,9 @@ runs: echo "region=eu-central-1" >> $GITHUB_OUTPUT echo "replicationRegions=us-east-2 ap-south-1" >> $GITHUB_OUTPUT echo "bucket=constellation-images" >> $GITHUB_OUTPUT - echo "efivarsPath=${basePath}/mkosi.output.aws/fedora~37/efivars.bin" >> $GITHUB_OUTPUT - echo "imagePath=${basePath}/mkosi.output.aws/fedora~37/image.raw" >> $GITHUB_OUTPUT - echo "jsonOutput=${basePath}/mkosi.output.aws/fedora~37/image-upload.json" >> $GITHUB_OUTPUT + echo "efivarsPath=${basePath}/mkosi.output.aws/fedora~36/efivars.bin" >> $GITHUB_OUTPUT + echo "imagePath=${basePath}/mkosi.output.aws/fedora~36/image.raw" >> $GITHUB_OUTPUT + echo "jsonOutput=${basePath}/mkosi.output.aws/fedora~36/image-upload.json" >> $GITHUB_OUTPUT echo "imageFilename=image-$(date +%s).raw" >> $GITHUB_OUTPUT if [[ "${stream}" = "stable" ]] then @@ -203,9 +203,9 @@ runs: echo "replicationRegions=northeurope eastus westeurope westus" >> $GITHUB_OUTPUT echo "sku=constellation" >> $GITHUB_OUTPUT echo "publisher=edgelesssys" >> $GITHUB_OUTPUT - echo "rawImagePath=${basePath}/mkosi.output.azure/fedora~37/image.raw" >> $GITHUB_OUTPUT - echo "imagePath=${basePath}/mkosi.output.azure/fedora~37/image.vhd" >> $GITHUB_OUTPUT - echo "jsonOutput=${basePath}/mkosi.output.azure/fedora~37/image-upload${uploadVariant}.json" >> $GITHUB_OUTPUT + echo "rawImagePath=${basePath}/mkosi.output.azure/fedora~36/image.raw" >> $GITHUB_OUTPUT + echo "imagePath=${basePath}/mkosi.output.azure/fedora~36/image.vhd" >> $GITHUB_OUTPUT + echo "jsonOutput=${basePath}/mkosi.output.azure/fedora~36/image-upload${uploadVariant}.json" >> $GITHUB_OUTPUT # TODO: set default security type to "ConfidentialVM" once replication is possible securityType=${{ inputs.uploadVariant }} if [[ -z "${securityType}" ]]; then @@ -258,9 +258,9 @@ runs: echo "project=constellation-images" >> $GITHUB_OUTPUT echo "bucket=constellation-images" >> $GITHUB_OUTPUT echo "region=europe-west3" >> $GITHUB_OUTPUT - echo "rawImagePath=${basePath}/mkosi.output.gcp/fedora~37/image.raw" >> $GITHUB_OUTPUT - echo "imagePath=${basePath}/mkosi.output.gcp/fedora~37/image.tar.gz" >> $GITHUB_OUTPUT - echo "jsonOutput=${basePath}/mkosi.output.gcp/fedora~37/image-upload.json" >> $GITHUB_OUTPUT + echo "rawImagePath=${basePath}/mkosi.output.gcp/fedora~36/image.raw" >> $GITHUB_OUTPUT + echo "imagePath=${basePath}/mkosi.output.gcp/fedora~36/image.tar.gz" >> $GITHUB_OUTPUT + echo "jsonOutput=${basePath}/mkosi.output.gcp/fedora~36/image-upload.json" >> $GITHUB_OUTPUT if [[ "${stream}" = "stable" ]] then echo "imageName=constellation-${imageVersion//./-}" >> $GITHUB_OUTPUT @@ -286,5 +286,5 @@ runs: run: | echo "bucket=cdn-constellation-backend" >> $GITHUB_OUTPUT echo "baseUrl=https://cdn.confidential.cloud" >> $GITHUB_OUTPUT - echo "imagePath=${basePath}/mkosi.output.qemu/fedora~37/image.raw" >> $GITHUB_OUTPUT - echo "jsonOutput=${basePath}/mkosi.output.qemu/fedora~37/image-upload.json" >> $GITHUB_OUTPUT + echo "imagePath=${basePath}/mkosi.output.qemu/fedora~36/image.raw" >> $GITHUB_OUTPUT + echo "jsonOutput=${basePath}/mkosi.output.qemu/fedora~36/image-upload.json" >> $GITHUB_OUTPUT diff --git a/.github/workflows/build-os-image.yml b/.github/workflows/build-os-image.yml index b2a836831..b306a430d 100644 --- a/.github/workflows/build-os-image.yml +++ b/.github/workflows/build-os-image.yml @@ -256,14 +256,14 @@ jobs: echo "image-raw-changelog-${{ matrix.csp }}-sha256=$(sha256sum image.raw.changelog | head -c 64)" echo "image-raw-manifest-${{ matrix.csp }}-sha256=$(sha256sum image.raw.manifest | head -c 64)" } >> "$GITHUB_OUTPUT" - working-directory: ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37 + working-directory: ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36 continue-on-error: true - name: Upload raw OS image as artifact uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # tag=v3.1.1 with: name: image-${{ matrix.csp }} - path: ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.raw + path: ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.raw if: always() continue-on-error: true @@ -272,13 +272,13 @@ jobs: with: name: parts-${{ matrix.csp }} path: | - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.cmdline - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.efi - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.initrd - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.root.raw - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.root.roothash - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.root.verity - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.vmlinuz + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.cmdline + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.efi + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.initrd + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.root.raw + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.root.roothash + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.root.verity + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.vmlinuz if: always() continue-on-error: true @@ -287,8 +287,8 @@ jobs: with: name: manifest-${{ matrix.csp }} path: | - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.raw.changelog - ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37/image.raw.manifest + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.raw.changelog + ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36/image.raw.manifest if: always() continue-on-error: true @@ -317,7 +317,7 @@ jobs: uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # tag=v3.0.1 with: name: image-${{ matrix.csp }} - path: ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~37 + path: ${{ github.workspace }}/image/mkosi.output.${{ matrix.csp }}/fedora~36 - name: Configure input variables id: vars