diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d7162e3..c6edf08 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -26,7 +26,7 @@ jobs: run: echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT build: needs: [set_version] - uses: gardenlinux/gardenlinux/.github/workflows/build.yml@838bb469f9b05d98a5057e139078d791d1922348 + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@3b5ec77e4873462d56658c4ecd56caa0ff63542b 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 d127c56..e8f3247 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@838bb469f9b05d98a5057e139078d791d1922348 + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@3b5ec77e4873462d56658c4ecd56caa0ff63542b with: version: ${{ inputs.version || 'now' }} # to set target to "release" or "nightly" we need proper KMS secrets @@ -36,7 +36,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@838bb469f9b05d98a5057e139078d791d1922348 + # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@3b5ec77e4873462d56658c4ecd56caa0ff63542b 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 d8e0032..1de89f4 100644 --- a/.github/workflows/upload_oci.yml +++ b/.github/workflows/upload_oci.yml @@ -8,7 +8,7 @@ on: jobs: generate_matrix_publish: name: Generate flavors matrix to publish - uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@838bb469f9b05d98a5057e139078d791d1922348 + uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@3b5ec77e4873462d56658c4ecd56caa0ff63542b with: flags: '--exclude "bare-*" --no-arch --json-by-arch --build --test' upload_gl_artifacts: diff --git a/Makefile b/Makefile index 12039a6..7ac935a 100644 --- a/Makefile +++ b/Makefile @@ -24,14 +24,14 @@ prepare: git submodule update --init --recursive update: - # update gardenlinux submodule to specified or latest commit + # update gardenlinux submodule to specified or latest commit cd $(ROOT_DIR)/gardenlinux && git fetch && git checkout $(COMMIT) && cd .. git add gardenlinux - # update workflow commit references + # update workflow commit references sed -i -E 's|(gardenlinux/gardenlinux/.github/workflows/[^@]*)@[0-9a-f]{40}|\1@$(COMMIT)|g' $(ROOT_DIR)/.github/workflows/*.y*ml - # update features + # update features mkdir -p $(ROOT_DIR)/features for feature in $$(ls $(ROOT_DIR)/gardenlinux/features); do \ if [ -L "$(ROOT_DIR)/features/$$feature" ]; then \ @@ -42,6 +42,20 @@ update: fi; \ done + # update symlinks in bin folder + mkdir -p $(ROOT_DIR)/bin + for script in $$(ls -A $(ROOT_DIR)/gardenlinux/bin); do \ + if [ "$$script" == "." ] || [ "$$script" == ".." ]; then \ + continue; \ + fi; \ + if [ -L "$(ROOT_DIR)/bin/$$script" ]; then \ + rm "$(ROOT_DIR)/bin/$$script"; \ + fi; \ + if [ ! -e "$(ROOT_DIR)/bin/$$script" ]; then \ + cd $(ROOT_DIR)/bin && ln -s "../gardenlinux/bin/$$script" "$$script"; \ + fi; \ + done + clean: git reset --soft rm -rf $(ROOT_DIR)/gardenlinux diff --git a/bin/clean-build-result-repository b/bin/clean-build-result-repository index 31c7d36..b18e715 120000 --- a/bin/clean-build-result-repository +++ b/bin/clean-build-result-repository @@ -1 +1 @@ -.cicd-cli.py \ No newline at end of file +../gardenlinux/bin/clean-build-result-repository \ No newline at end of file diff --git a/bin/glrd-manage b/bin/glrd-manage new file mode 120000 index 0000000..80b54b0 --- /dev/null +++ b/bin/glrd-manage @@ -0,0 +1 @@ +../gardenlinux/bin/glrd-manage \ No newline at end of file diff --git a/gardenlinux b/gardenlinux index 838bb46..3b5ec77 160000 --- a/gardenlinux +++ b/gardenlinux @@ -1 +1 @@ -Subproject commit 838bb469f9b05d98a5057e139078d791d1922348 +Subproject commit 3b5ec77e4873462d56658c4ecd56caa0ff63542b