Try fix

Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Jan 17, 2025 · 30cc4f6 · 30cc4f6
1 parent 6013602
commit 30cc4f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/push-aws-test.yaml b/.github/workflows/push-aws-test.yaml
@@ -27,24 +27,18 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: |
           git fetch --prune --unshallow
-      - name: Release space from worker
-        run: |
-          ./.github/release-space-from-ubuntu-runners.sh
+      # - name: Release space from worker
+      #   run: |
+      #     ./.github/release-space-from-ubuntu-runners.sh
       - name: Install kairos-agent (for versioneer)
         uses: Luet-lab/luet-install-action@cec77490c3f2416d7d07a47cfab04d448641d7ce # v1.1
         with:
           repository: quay.io/kairos/packages
           packages: system/kairos-agent
       - name: Build 🔧
+        shell: bash
         run: |
-          # REPLACE_IN_FINAL
-          # TODO: Does "sort" work correctly on k3s versions? Which version do we want?
-          #k3s_version=$(echo '${{ needs.get-standard-matrix.outputs.matrix }}' | \
-          #  jq -r '[.[].k3s_version] | unique | sort | .[0]')
           k3s_version=v1.32.0-k3s1
-
-          # REPLACE_IN_FINAL
-          #version=$(git describe --always --tags --dirty)
           version=master
 
           containerImage=$(kairos-agent versioneer container-artifact-name \
@@ -58,10 +52,11 @@ jobs:
             --software-version "$k3s_version" \
             --version "$version"
           )
+          echo "Using $containerImage to build a cloud image"
 
           docker run -v /var/run/docker.sock:/var/run/docker.sock --net host \
             --privileged \
-            -v $PWD:/aurora --rm -ti quay.io/kairos/auroraboot \
+            -v $PWD:/aurora --rm quay.io/kairos/auroraboot \
             --debug \
             --set "disable_http_server=true" \
             --set "container_image=docker:${containerImage}" \

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -377,6 +377,8 @@ jobs:
           k3s_version=$(echo '${{ needs.get-standard-matrix.outputs.matrix }}' | \
             jq -r '[.[].k3s_version] | unique | sort | .[0]')
 
+          version=$(git describe --always --tags --dirty)
+
           containerImage=$(kairos-agent versioneer container-artifact-name \
             --flavor ${{ matrix.flavor }} \
             --flavor-release ${{ matrix.flavor_release }} \
@@ -386,12 +388,13 @@ jobs:
             --software-version-prefix k3s \
             --registry-and-org quay.io/kairos \
             --software-version "$k3s_version" \
-            --version $(git describe --always --tags --dirty)
+            --version "$version"
           )
+          echo "Using $containerImage to build a cloud image"
 
           docker run -v /var/run/docker.sock:/var/run/docker.sock --net host \
             --privileged \
-            -v $PWD:/aurora --rm -ti quay.io/kairos/auroraboot \
+            -v $PWD:/aurora --rm quay.io/kairos/auroraboot \
             --debug \
             --set "disable_http_server=true" \
             --set "container_image=docker:${IMAGE}" \