From bac9d415779e9b1f6601ae00dce22b822c0cd2b9 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:55:28 +0100 Subject: [PATCH 1/9] make it easier to generate gradle verification reference --- bitrise.yml | 85 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 28 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 10ddca5..697bac7 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -12,6 +12,7 @@ trigger_map: workflow: test - tag: '*.*.*' workflow: release + workflows: release: description: Creates Linux and Darwin binaries, then publishes a GitHub release @@ -38,33 +39,7 @@ workflows: set -ex GOBIN=/usr/local/bin/ go install github.com/goreleaser/goreleaser/v2@latest - - script: - title: Generate verification - inputs: - - content: | - #!/bin/bash - set -ex - - # Backup $HOME/.gradle/init.d/bitrise-build-cache.init.gradle.kts - GRADLE_INIT_PATH=$HOME/.gradle/init.d/bitrise-build-cache.init.gradle.kts - if [[ -f "$GRADLE_INIT_PATH" ]]; then - mv $GRADLE_INIT_PATH $GRADLE_INIT_PATH.backup - fi - - go build -o /tmp/bin/bitrise-build-cache-cli - - SAMPLE_PATH=$(realpath ./gradle_verification_sample) - - # add plugin with CLI - cd "$SAMPLE_PATH" - /tmp/bin/bitrise-build-cache-cli add-gradle-deps - - # generate xml - rm -f "$SAMPLE_PATH/gradle/verification-metadata.xml" - ./gradlew --write-verification-metadata sha256 help - - echo "Generated verification xml:" - cat "$SAMPLE_PATH/gradle/verification-metadata.xml" + - bundle::generate_gradle_verification_reference: { } - script: title: Goreleaser (create binaries + publish to GH) deps: @@ -82,6 +57,8 @@ workflows: machine_type_id: g2-m1.8core stack: osx-xcode-edge test: + after_run: + - check_gradle_verification steps: - activate-ssh-key@4: run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}' @@ -95,6 +72,7 @@ workflows: set -ex make lint - go-test@1: {} + - bundle::generate_gradle_verification_reference: { } - deploy-to-bitrise-io@2: {} e2e: @@ -113,5 +91,56 @@ workflows: inputs: - content: |- set -ex - bitrise run --config e2e/bitrise.yml test_gradle_output_diagnostics + bitrise run --config e2e/bitrise.yml test_gradle_output_diagnostics + + check_gradle_verification: + steps: + - bundle::generate_gradle_verification_reference: { } + +step_bundles: + generate_gradle_verification_reference: + steps: + - script: + title: Generate Gradle verification reference + inputs: + - content: | + #!/bin/bash + set -ex + + # Backup $HOME/.gradle/init.d/bitrise-build-cache.init.gradle.kts + GRADLE_INIT_PATH=$HOME/.gradle/init.d/bitrise-build-cache.init.gradle.kts + if [[ -f "$GRADLE_INIT_PATH" ]]; then + mv $GRADLE_INIT_PATH $GRADLE_INIT_PATH.backup + fi + + go build -o /tmp/bin/bitrise-build-cache-cli + + SAMPLE_PATH=$(realpath ./gradle_verification_sample) + + # add plugin with CLI + cd "$SAMPLE_PATH" + /tmp/bin/bitrise-build-cache-cli add-gradle-deps + + # generate xml + rm -f "$SAMPLE_PATH/gradle/verification-metadata.xml" + ./gradlew --write-verification-metadata sha256 help + + GRADLE_VERIFICATION_REF_PATH=$SAMPLE_PATH/gradle/verification-metadata.xml + echo "Generated verification xml: $GRADLE_VERIFICATION_REF_PATH" + envman add --key GRADLE_VERIFICATION_REF_PATH --value "$GRADLE_VERIFICATION_REF_PATH" + - script@1: + title: Check if local updates to verification-metadata.xml are not commited + inputs: + - content: |- + set -x + + git update-index --refresh | grep "verification-metadata.xml" + if [[ $? == 0 ]]; then + echo "Please manually commit the changes to the repo:" + echo "$GRADLE_VERIFICATION_REF_PATH" + exit 1 + else + echo "The files have no unstaged changes: $GRADLE_VERIFICATION_REF_PATH" + exit 0 + fi From 6bbcb967e80fb896c2efb62526507f0bd4ccfbfa Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:17:11 +0100 Subject: [PATCH 2/9] Print metadata content --- bitrise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/bitrise.yml b/bitrise.yml index 697bac7..d04ccec 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -126,6 +126,7 @@ step_bundles: ./gradlew --write-verification-metadata sha256 help GRADLE_VERIFICATION_REF_PATH=$SAMPLE_PATH/gradle/verification-metadata.xml + cat $GRADLE_VERIFICATION_REF_PATH echo "Generated verification xml: $GRADLE_VERIFICATION_REF_PATH" envman add --key GRADLE_VERIFICATION_REF_PATH --value "$GRADLE_VERIFICATION_REF_PATH" - script@1: From 4eb038b551803b7dc1f2b0f2c7de70474bb0bf87 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:22:04 +0100 Subject: [PATCH 3/9] use macos stack --- bitrise.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index d04ccec..6461134 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -54,8 +54,7 @@ workflows: - deploy-to-bitrise-io@2: {} meta: bitrise.io: - machine_type_id: g2-m1.8core - stack: osx-xcode-edge + stack: osx-xcode-16.1.x test: after_run: - check_gradle_verification @@ -74,6 +73,9 @@ workflows: - go-test@1: {} - bundle::generate_gradle_verification_reference: { } - deploy-to-bitrise-io@2: {} + meta: + bitrise.io: + stack: osx-xcode-16.1.x e2e: steps: From 3b9e268a68e487274a9d6aa25650323e30318523 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:30:22 +0100 Subject: [PATCH 4/9] Update verification xml. For some reason if running on CI contained 2 extra deps. --- .../gradle/verification-metadata.xml | 8 + .../verification-metadata.xml | 669 ------------------ 2 files changed, 8 insertions(+), 669 deletions(-) delete mode 100644 gradle_verification_sample/verification-metadata.xml diff --git a/gradle_verification_sample/gradle/verification-metadata.xml b/gradle_verification_sample/gradle/verification-metadata.xml index 133bf16..eb77d74 100644 --- a/gradle_verification_sample/gradle/verification-metadata.xml +++ b/gradle_verification_sample/gradle/verification-metadata.xml @@ -91,6 +91,11 @@ + + + + + @@ -630,6 +635,9 @@ + + + diff --git a/gradle_verification_sample/verification-metadata.xml b/gradle_verification_sample/verification-metadata.xml deleted file mode 100644 index 133bf16..0000000 --- a/gradle_verification_sample/verification-metadata.xml +++ /dev/null @@ -1,669 +0,0 @@ - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0780ccda0819c9d85afe0b4e27348ca4585d86e9 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:27:50 +0100 Subject: [PATCH 5/9] undo stacj changes, build was not triggered --- bitrise.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 6461134..1f84c22 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -39,7 +39,7 @@ workflows: set -ex GOBIN=/usr/local/bin/ go install github.com/goreleaser/goreleaser/v2@latest - - bundle::generate_gradle_verification_reference: { } + - bundle::check_gradle_verification_reference: { } - script: title: Goreleaser (create binaries + publish to GH) deps: @@ -54,7 +54,8 @@ workflows: - deploy-to-bitrise-io@2: {} meta: bitrise.io: - stack: osx-xcode-16.1.x + machine_type_id: g2-m1.8core + stack: osx-xcode-edge test: after_run: - check_gradle_verification @@ -71,11 +72,12 @@ workflows: set -ex make lint - go-test@1: {} - - bundle::generate_gradle_verification_reference: { } + - bundle::check_gradle_verification_reference: { } - deploy-to-bitrise-io@2: {} meta: bitrise.io: - stack: osx-xcode-16.1.x + machine_type_id: g2-m1.8core + stack: osx-xcode-edge e2e: steps: @@ -97,10 +99,10 @@ workflows: check_gradle_verification: steps: - - bundle::generate_gradle_verification_reference: { } + - bundle::check_gradle_verification_reference: { } step_bundles: - generate_gradle_verification_reference: + check_gradle_verification_reference: steps: - script: title: Generate Gradle verification reference From 590981313d4ef51b4290532d2a85659e234b7327 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:28:41 +0100 Subject: [PATCH 6/9] removed duplicated after-run --- bitrise.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 1f84c22..4a875b6 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -57,8 +57,6 @@ workflows: machine_type_id: g2-m1.8core stack: osx-xcode-edge test: - after_run: - - check_gradle_verification steps: - activate-ssh-key@4: run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}' From 59ee066da2572e58044e06116e4029ea5c1d1dd2 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:34:06 +0100 Subject: [PATCH 7/9] Update golangci-lint to 1.60.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 58e04a0..d124778 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Tool versions -GOLANGCI_LINT_VERSION = v1.58.1 +GOLANGCI_LINT_VERSION = v1.60.0 .PHONY: lint lint: ## Runs golangci-lint From 1c2f7e8ada21d2a9c7dc9810de6bf5d89622a0a8 Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:37:11 +0100 Subject: [PATCH 8/9] Removed disabled linters --- .golangci.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index bccc52c..4ed9ec4 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,16 +1,6 @@ linters: enable-all: true disable: - - varcheck # deprecated - - deadcode # deprecated - - interfacer # deprecated - - golint # deprecated - - nosnakecase # deprecated - - structcheck # deprecated - - exhaustivestruct # deprecated - - ifshort # deprecated - - maligned # deprecated - - scopelint # deprecated - funlen - gochecknoinits - lll # line too long From 09808feb1a9f9f02e3da83c07f44d94fc39f8d3e Mon Sep 17 00:00:00 2001 From: LaszloP <7979773+lpusok@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:45:54 +0100 Subject: [PATCH 9/9] Update gradle verification --- .../gradle/verification-metadata.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle_verification_sample/gradle/verification-metadata.xml b/gradle_verification_sample/gradle/verification-metadata.xml index eb77d74..4641810 100644 --- a/gradle_verification_sample/gradle/verification-metadata.xml +++ b/gradle_verification_sample/gradle/verification-metadata.xml @@ -172,12 +172,12 @@ - - - + + + - - + +