diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index a8f95317..db21451c 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -42,7 +42,7 @@ jobs: build: needs: [set_version] if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }} - uses: gardenlinux/gardenlinux/.github/workflows/build.yml@c15e9789b16b0e64019b52b45fb6fa3b3c0f608c + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@ed75af27781084f5e6742bab59b89861150098d8 with: version: ${{ needs.set_version.outputs.VERSION }} # to set target to "release" or "nightly" we need proper KMS secrets diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 44c1fc0c..c23e9d48 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -19,7 +19,7 @@ jobs: submodules: recursive build: needs: [checkout] - uses: gardenlinux/gardenlinux/.github/workflows/build.yml@c15e9789b16b0e64019b52b45fb6fa3b3c0f608c + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@ed75af27781084f5e6742bab59b89861150098d8 with: version: ${{ inputs.version || 'now' }} # to set target to "release" or "nightly" we need proper KMS secrets @@ -49,7 +49,7 @@ jobs: name: Run glcli to publish to OCI needs: [build] # use custom upload_oci.yml as we do not sign the images - # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@c15e9789b16b0e64019b52b45fb6fa3b3c0f608c + # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@ed75af27781084f5e6742bab59b89861150098d8 uses: ./.github/workflows/upload_oci.yml with: version: ${{ needs.build.outputs.version }} diff --git a/.github/workflows/upload_oci.yml b/.github/workflows/upload_oci.yml index d97e1093..e5a4f27b 100644 --- a/.github/workflows/upload_oci.yml +++ b/.github/workflows/upload_oci.yml @@ -14,7 +14,7 @@ on: jobs: generate_matrix_publish: name: Generate flavors matrix to publish - uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@c15e9789b16b0e64019b52b45fb6fa3b3c0f608c + uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@ed75af27781084f5e6742bab59b89861150098d8 with: flags: '${{ inputs.flavor_filter }} --no-arch --json-by-arch --build --test' upload_gl_artifacts: diff --git a/Makefile b/Makefile index 386a4108..614e5b68 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ update: new_builder_image=$$(grep -m1 '^container_image=' $(ROOT_DIR)/gardenlinux/build | cut -d= -f2); \ current_builder_image=$$(grep -m1 '^container_image=' $(ROOT_DIR)/build | cut -d= -f2); \ if [ "$$new_builder_image" != "$$current_builder_image" ]; then \ - $(SED) -i -E 's|^container_image=.*|container_image=$$new_builder_image|' $(ROOT_DIR)/build; \ + $(SED) -i -E 's|^container_image=.*|container_image='$$new_builder_image'|' $(ROOT_DIR)/build; \ fi clean: diff --git a/build b/build index a3f117ea..ef25db69 100755 --- a/build +++ b/build @@ -6,7 +6,7 @@ shopt -s nullglob exec 3>&1 exec 1>&2 -container_image=ghcr.io/gardenlinux/builder:0196add0ce875ac0b7721c19b2ee3ac37cf84387 +container_image=ghcr.io/gardenlinux/builder:f7cf91087f7580c6c3aefb26af6cee7df89a9938 container_engine=podman target_dir=.build diff --git a/features/stackit b/features/stackit new file mode 120000 index 00000000..19a6e6ef --- /dev/null +++ b/features/stackit @@ -0,0 +1 @@ +../gardenlinux/features/stackit \ No newline at end of file diff --git a/gardenlinux b/gardenlinux index c15e9789..ed75af27 160000 --- a/gardenlinux +++ b/gardenlinux @@ -1 +1 @@ -Subproject commit c15e9789b16b0e64019b52b45fb6fa3b3c0f608c +Subproject commit ed75af27781084f5e6742bab59b89861150098d8