From c4006d36ee0ab5271aa39e4172a9612c1fb40f32 Mon Sep 17 00:00:00 2001 From: lotyp Date: Fri, 24 May 2024 15:31:33 +0300 Subject: [PATCH 1/3] ci: change release-please namespace --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 0ade416b..a110b80b 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🎉 Create release - uses: google-github-actions/release-please-action@v4 + uses: googleapis/release-please-action@v4.1.1 id: release with: token: ${{ secrets.TRAP_RELEASE_TOKEN }} From 7c80552635d0703e2cbd15bde3a76eedc5adcb08 Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Fri, 24 May 2024 16:46:18 +0400 Subject: [PATCH 2/3] fix: fixed path to keys.asc.gpg to sign phar --- .gitattributes | 1 - {.phar => .github/phar}/keys.asc.gpg | Bin .github/workflows/build-phar-release.yml | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) rename {.phar => .github/phar}/keys.asc.gpg (100%) diff --git a/.gitattributes b/.gitattributes index d5d94a8b..81cbf861 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,6 @@ .github export-ignore .phive export-ignore -phar export-ignore tests export-ignore .* export-ignore box.json.dist export-ignore diff --git a/.phar/keys.asc.gpg b/.github/phar/keys.asc.gpg similarity index 100% rename from .phar/keys.asc.gpg rename to .github/phar/keys.asc.gpg diff --git a/.github/workflows/build-phar-release.yml b/.github/workflows/build-phar-release.yml index 5afb93f4..29de652c 100644 --- a/.github/workflows/build-phar-release.yml +++ b/.github/workflows/build-phar-release.yml @@ -21,7 +21,7 @@ jobs: TRAP_PHAR: ".build/phar/trap.phar" TRAP_PHAR_SIGNATURE: ".build/phar/trap.phar.asc" GPG_KEYS: ".build/phar/keys.asc" - GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg" + GPG_KEYS_ENCRYPTED: ".github/phar/keys.asc.gpg" steps: - name: 📦 Check out the codebase uses: actions/checkout@v4.1.5 From 87e18eb1f8c83604cf6677ebbb078e21ba3ea01e Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Fri, 24 May 2024 16:51:55 +0400 Subject: [PATCH 3/3] chore: move .yamllint.yaml into .github dir --- .yamllint.yaml => .github/.yamllint.yaml | 0 .github/workflows/coding-standards.yml | 2 +- Makefile | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename .yamllint.yaml => .github/.yamllint.yaml (100%) diff --git a/.yamllint.yaml b/.github/.yamllint.yaml similarity index 100% rename from .yamllint.yaml rename to .github/.yamllint.yaml diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 7f734bd2..c47afa07 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -42,7 +42,7 @@ jobs: - name: 🧐 Lint YAML files uses: ibiqlik/action-yamllint@v3.1.1 with: - config_file: .yamllint.yaml + config_file: .github/.yamllint.yaml file_or_dir: '.' strict: true diff --git a/Makefile b/Makefile index c6806245..618039f7 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ ENVSUBST ?= $(BUILDER) envsubst YAML_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \ -v $(PWD):/data \ cytopia/yamllint:latest \ + -c ./.github/.yamllint.yaml \ -f colored . ACTION_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \