Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/upload_oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 17 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/clean-build-result-repository
1 change: 1 addition & 0 deletions bin/glrd-manage
2 changes: 1 addition & 1 deletion gardenlinux