From a362bac67ce8ef931ded465de7675b00edf0d962 Mon Sep 17 00:00:00 2001 From: Soubinan Date: Thu, 16 Jan 2025 00:57:04 -0500 Subject: [PATCH 1/5] remove manual run.. --- .github/workflows/trigger.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/trigger.yml b/.github/workflows/trigger.yml index 5007aba..ab64ab0 100644 --- a/.github/workflows/trigger.yml +++ b/.github/workflows/trigger.yml @@ -14,17 +14,6 @@ on: - "./templates/*" schedule: - cron: "0 0 */7 * *" - workflow_dispatch: - inputs: - logLevel: - description: "Log level" - required: true - default: "warning" - type: choice - options: - - warning - - info - - debug jobs: init: From 317fc6b2b002e7c27c382a1e2d79c4435794d2ce Mon Sep 17 00:00:00 2001 From: Soubinan Date: Thu, 16 Jan 2025 01:08:38 -0500 Subject: [PATCH 2/5] Change masterkey size (64 bytes limitation) --- templates/zitadel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zitadel.yml b/templates/zitadel.yml index 6400fe1..73edb11 100644 --- a/templates/zitadel.yml +++ b/templates/zitadel.yml @@ -76,7 +76,7 @@ instructions: mkdir -p /opt/zitadel echo "ZITADEL_DATABASE_POSTGRES_USER_PASSWORD=$(/usr/bin/openssl rand -hex 16)" >> /opt/zitadel/.env - echo "ZITADEL_MASTERKEY=$(/usr/bin/openssl rand -hex 32)" >> /opt/zitadel/.env + echo "ZITADEL_MASTERKEY=$(/usr/bin/openssl rand -hex 16)" >> /opt/zitadel/.env PG_VERSION=$(ls -1 /etc/postgresql) From 17659fb6a53dc07028f4c7831a941cde70e4e79f Mon Sep 17 00:00:00 2001 From: Soubinan Date: Thu, 16 Jan 2025 01:35:07 -0500 Subject: [PATCH 3/5] modify build and publishing eligibility checks --- .github/workflows/builder.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 0d12868..84db9ff 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -73,8 +73,8 @@ jobs: - name: Check necessary steps id: validity-checks run: | - echo "IS_BUILDABLE=${{github.event_name != 'schedule' || (steps.version-check.outputs.SUBMITTED_BUILD_ID != steps.version-check.outputs.CHECKED_BUILD_ID && github.event_name == 'schedule')}}" >> $GITHUB_OUTPUT - echo "IS_PUBLISHABLE=${{inputs.branch_name == 'test' || (steps.version-check.outputs.SUBMITTED_BUILD_ID != steps.version-check.outputs.CHECKED_BUILD_ID && github.event_name == 'schedule') || (inputs.branch_name == 'main' && inputs.is_merged == true)}}" >> $GITHUB_OUTPUT + echo "IS_BUILDABLE=${{github.event_name == 'pull_request' || (steps.version-check.outputs.SUBMITTED_BUILD_ID != steps.version-check.outputs.CHECKED_BUILD_ID && github.event_name == 'schedule')}}" >> $GITHUB_OUTPUT + echo "IS_PUBLISHABLE=${{inputs.branch_name == 'test' || (inputs.branch_name == 'main' && inputs.is_merged == true)}}" >> $GITHUB_OUTPUT - name: Check out repository uses: actions/checkout@v4 @@ -109,7 +109,7 @@ jobs: pwd && ls -lash - name: Publish Image files - if: ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == true run: | cat << EOF > /tmp/rclone.conf $RCLONE_CONFIG @@ -124,7 +124,7 @@ jobs: RCLONE_CONFIG_PASS: ${{secrets.RCLONE_CONFIG_PASS}} - name: Publish Image metadata - if: ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == true run: | CATEGORIES_STR="${{needs.init.outputs.categories}}" CATEGORIES_FMT=$(echo "[\"$CATEGORIES_STR\"]" | sed -E 's/^\["[ ,]+/["/g' | sed -E 's/[ ,]+"]$/"]/g' | sed -E 's/ *, */","/g') From c707967ac29a1cec395adcabb713e9e9848d09ee Mon Sep 17 00:00:00 2001 From: Soubinan Date: Thu, 16 Jan 2025 01:45:26 -0500 Subject: [PATCH 4/5] Try fix value interpretation issue --- .github/workflows/builder.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 84db9ff..6dd84fc 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -78,10 +78,10 @@ jobs: - name: Check out repository uses: actions/checkout@v4 - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" - name: Install required tools - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" run: | sudo apt-get update -y sudo apt-get install -y debootstrap squashfs-tools wget unzip python3 python3-pip @@ -95,12 +95,12 @@ jobs: sudo -v ; wget -q https://kcl-lang.io/script/install-cli.sh -O - | sudo bash - name: Create Distrobuilder LXC template file - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" run: | kcl run ${{github.workspace}}/__layout.k -D input=${{github.workspace}}/${{inputs.config_path}} -o /tmp/${{needs.init.outputs.app_name}}.build - name: Build Image - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" run: | sudo distrobuilder --cache-dir /tmp/cache/${{needs.init.outputs.app_name}} build-lxc /tmp/${{needs.init.outputs.app_name}}.build -o image.serial="${{needs.init.outputs.app_version}}" -o image.architecture=${{matrix.architectures}} /tmp/output/${{needs.init.outputs.app_name}}/ mv /tmp/output/${{needs.init.outputs.app_name}}/rootfs.tar.xz ./${{needs.init.outputs.app_name}}-${{needs.init.outputs.app_version}}-${{matrix.architectures}}-root.tar.xz @@ -109,7 +109,7 @@ jobs: pwd && ls -lash - name: Publish Image files - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == "true" run: | cat << EOF > /tmp/rclone.conf $RCLONE_CONFIG @@ -124,7 +124,7 @@ jobs: RCLONE_CONFIG_PASS: ${{secrets.RCLONE_CONFIG_PASS}} - name: Publish Image metadata - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == true && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == true + if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == "true" run: | CATEGORIES_STR="${{needs.init.outputs.categories}}" CATEGORIES_FMT=$(echo "[\"$CATEGORIES_STR\"]" | sed -E 's/^\["[ ,]+/["/g' | sed -E 's/[ ,]+"]$/"]/g' | sed -E 's/ *, */","/g') From 868f43ec0bf0213aa8b9196351c6d07e04fe44b6 Mon Sep 17 00:00:00 2001 From: Soubinan Date: Thu, 16 Jan 2025 02:03:07 -0500 Subject: [PATCH 5/5] fix wrong usage of conditions (seems it was) --- .github/workflows/builder.yml | 16 ++++++++-------- .github/workflows/trigger.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 6dd84fc..3a71af1 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -54,11 +54,11 @@ jobs: image-build: needs: init - if: ${{needs.init.outputs.app_version}} != "null" && ${{needs.init.outputs.app_version}} != "" + if: ${{needs.init.outputs.app_version != 'null' && needs.init.outputs.app_version != ''}} runs-on: ubuntu-latest strategy: matrix: - architectures: ${{ fromJson(needs.init.outputs.architectures) }} + architectures: ${{fromJson(needs.init.outputs.architectures)}} steps: - name: Check submitted version id: version-check @@ -78,10 +78,10 @@ jobs: - name: Check out repository uses: actions/checkout@v4 - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" + if: ${{steps.validity-checks.outputs.IS_BUILDABLE == 'true'}} - name: Install required tools - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" + if: ${{steps.validity-checks.outputs.IS_BUILDABLE == 'true'}} run: | sudo apt-get update -y sudo apt-get install -y debootstrap squashfs-tools wget unzip python3 python3-pip @@ -95,12 +95,12 @@ jobs: sudo -v ; wget -q https://kcl-lang.io/script/install-cli.sh -O - | sudo bash - name: Create Distrobuilder LXC template file - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" + if: ${{steps.validity-checks.outputs.IS_BUILDABLE == 'true'}} run: | kcl run ${{github.workspace}}/__layout.k -D input=${{github.workspace}}/${{inputs.config_path}} -o /tmp/${{needs.init.outputs.app_name}}.build - name: Build Image - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" + if: ${{steps.validity-checks.outputs.IS_BUILDABLE == 'true'}} run: | sudo distrobuilder --cache-dir /tmp/cache/${{needs.init.outputs.app_name}} build-lxc /tmp/${{needs.init.outputs.app_name}}.build -o image.serial="${{needs.init.outputs.app_version}}" -o image.architecture=${{matrix.architectures}} /tmp/output/${{needs.init.outputs.app_name}}/ mv /tmp/output/${{needs.init.outputs.app_name}}/rootfs.tar.xz ./${{needs.init.outputs.app_name}}-${{needs.init.outputs.app_version}}-${{matrix.architectures}}-root.tar.xz @@ -109,7 +109,7 @@ jobs: pwd && ls -lash - name: Publish Image files - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == "true" + if: ${{steps.validity-checks.outputs.IS_BUILDABLE == 'true' && steps.validity-checks.outputs.IS_PUBLISHABLE == 'true'}} run: | cat << EOF > /tmp/rclone.conf $RCLONE_CONFIG @@ -124,7 +124,7 @@ jobs: RCLONE_CONFIG_PASS: ${{secrets.RCLONE_CONFIG_PASS}} - name: Publish Image metadata - if: ${{steps.validity-checks.outputs.IS_BUILDABLE}} == "true" && ${{steps.validity-checks.outputs.IS_PUBLISHABLE}} == "true" + if: ${{steps.validity-checks.outputs.IS_BUILDABLE == 'true' && steps.validity-checks.outputs.IS_PUBLISHABLE == 'true'}} run: | CATEGORIES_STR="${{needs.init.outputs.categories}}" CATEGORIES_FMT=$(echo "[\"$CATEGORIES_STR\"]" | sed -E 's/^\["[ ,]+/["/g' | sed -E 's/[ ,]+"]$/"]/g' | sed -E 's/ *, */","/g') diff --git a/.github/workflows/trigger.yml b/.github/workflows/trigger.yml index ab64ab0..7d17e1a 100644 --- a/.github/workflows/trigger.yml +++ b/.github/workflows/trigger.yml @@ -27,7 +27,7 @@ jobs: uses: tj-actions/changed-files@v45 with: files: templates/** - if: ${{github.event_name}} == 'pull_request' + if: ${{github.event_name == 'pull_request'}} - name: List all templates id: all-templates-list