diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index e7ad1f8..c5e12ac 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -59,13 +59,13 @@ jobs: shell: bash run: | if [[ -z "${{ inputs.appsToBuild }}" ]]; then - matrices=$(python ./.github/scripts/prepare-matrices.py "all" "${{ inputs.pushImages }}" "${{ inputs.force }}") + matrices=$(python ./scripts/prepare-matrices.py "all" "${{ inputs.pushImages }}" "${{ inputs.force }}") else - if [[ -z "${{ inputs.channelsToBuild }}" ]]; then - matrices=$(python ./.github/scripts/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}") - else - matrices=$(python ./.github/scripts/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}" "${{ inputs.channelsToBuild }}") - fi + if [[ -z "${{ inputs.channelsToBuild }}" ]]; then + matrices=$(python ./scripts/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}") + else + matrices=$(python ./scripts/prepare-matrices.py "${{ inputs.appsToBuild }}" "${{ inputs.pushImages }}" "${{ inputs.force }}" "${{ inputs.channelsToBuild }}") + fi fi echo "matrices=${matrices}" >> $GITHUB_OUTPUT echo "${matrices}" diff --git a/.github/workflows/label-sync.yaml b/.github/workflows/label-sync.yaml index 3a91911..c686deb 100644 --- a/.github/workflows/label-sync.yaml +++ b/.github/workflows/label-sync.yaml @@ -47,7 +47,7 @@ jobs: - name: Append app labels to the labels config file shell: bash - run: task ci:append-app-labels + run: task append-app-labels --force - name: Sync Labels uses: EndBug/label-sync@v2 diff --git a/.github/workflows/release-on-merge.yaml b/.github/workflows/release-on-merge.yaml index 838e23b..7e1d88b 100644 --- a/.github/workflows/release-on-merge.yaml +++ b/.github/workflows/release-on-merge.yaml @@ -11,8 +11,7 @@ on: branches: ["main"] paths: - "apps/**" - - ".github/scripts/templates/**" - - "!apps/**/metadata.json" + - "scripts/templates/**" - "!apps/**/metadata.yaml" - "!apps/**/README.md" diff --git a/.github/workflows/render-readme.yaml b/.github/workflows/render-readme.yaml index 35e0c6d..c29b200 100644 --- a/.github/workflows/render-readme.yaml +++ b/.github/workflows/render-readme.yaml @@ -48,7 +48,7 @@ jobs: env: GITHUB_TOKEN: "${{ steps.app-token.outputs.token }}" shell: bash - run: python ./.github/scripts/render-readme.py + run: python ./scripts/render-readme.py - name: Commit Changes uses: planetscale/ghcommit-action@v0.1.46 diff --git a/.github/workflows/simple-checks.yaml b/.github/workflows/simple-checks.yaml index 06f6317..6bfb476 100644 --- a/.github/workflows/simple-checks.yaml +++ b/.github/workflows/simple-checks.yaml @@ -22,7 +22,6 @@ jobs: files_yaml: | cue: - metadata.rules.cue - - apps/**/metadata.json - apps/**/metadata.yaml - name: Setup CUE @@ -34,5 +33,4 @@ jobs: if: ${{ steps.changed-files.outputs.cue_any_changed == 'true' }} shell: bash run: | - find ./apps/ -name metadata.json | xargs -I {} cue vet --schema '#Spec' {} ./metadata.rules.cue find ./apps/ -name metadata.yaml | xargs -I {} cue vet --schema '#Spec' {} ./metadata.rules.cue diff --git a/.gitignore b/.gitignore index bcedb59..72d46f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -.goss/ .private/ .task/ .venv/ +__pycache__/ **/*.pyc diff --git a/.taskfiles/ci/Taskfile.yaml b/.taskfiles/ci/Taskfile.yaml deleted file mode 100644 index e95fa51..0000000 --- a/.taskfiles/ci/Taskfile.yaml +++ /dev/null @@ -1,16 +0,0 @@ - ---- -version: '3' -vars: - LABELS_CONFIG_FILE: '{{.ROOT_DIR}}/.github/labels.yaml' -tasks: - append-app-labels: - desc: Append app labels to the labels config file - cmds: - - for: { var: apps } - cmd: | - yq -i '. += [{"name": "app/{{.ITEM}}", "color": "0e8a16"}]' {{.LABELS_CONFIG_FILE}} - vars: - apps: - sh: for dir in {{.ROOT_DIR}}/apps/*/; do basename "${dir}"; done - silent: true diff --git a/.taskfiles/workstation/Taskfile.yaml b/.taskfiles/workstation/Taskfile.yaml deleted file mode 100644 index 4d752c2..0000000 --- a/.taskfiles/workstation/Taskfile.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -# yaml-language-server: $schema=https://taskfile.dev/schema.json -version: '3' -vars: - PIP_REQUIREMENTS_FILE: '{{.ROOT_DIR}}/requirements.txt' - PYTHON_BIN: python3 -tasks: - python: - desc: Set up a Python virtual environment - cmds: - - '{{.PYTHON_BIN}} -m venv {{.VIRTUAL_ENV}}' - - '{{.VIRTUAL_ENV}}/bin/python3 -m pip install --upgrade pip setuptools wheel' - - '{{.VIRTUAL_ENV}}/bin/python3 -m pip install --upgrade --requirement "{{.PIP_REQUIREMENTS_FILE}}"' - sources: - - '{{.PIP_REQUIREMENTS_FILE}}' - generates: - - '{{.VIRTUAL_ENV}}/pyvenv.cfg' - preconditions: - - test -f {{.PIP_REQUIREMENTS_FILE}} diff --git a/.github/scripts/prepare-matrices.py b/scripts/prepare-matrices.py similarity index 100% rename from .github/scripts/prepare-matrices.py rename to scripts/prepare-matrices.py diff --git a/.github/scripts/render-readme.py b/scripts/render-readme.py similarity index 100% rename from .github/scripts/render-readme.py rename to scripts/render-readme.py diff --git a/.github/scripts/templates/README.md.j2 b/scripts/templates/README.md.j2 similarity index 98% rename from .github/scripts/templates/README.md.j2 rename to scripts/templates/README.md.j2 index 90576ae..68dfc65 100644 --- a/.github/scripts/templates/README.md.j2 +++ b/scripts/templates/README.md.j2 @@ -1,6 +1,6 @@