diff --git a/.github/workflows/publish-go-tester-task.yml b/.github/workflows/publish-go-tester-task.yml index 2c30857b..383aecb9 100644 --- a/.github/workflows/publish-go-tester-task.yml +++ b/.github/workflows/publish-go-tester-task.yml @@ -9,6 +9,7 @@ on: - "go.mod" - "go.sum" - "Taskfile.ya?ml" + - "DistTasks.ya?ml" - "**.go" pull_request: paths: @@ -16,6 +17,7 @@ on: - "go.mod" - "go.sum" - "Taskfile.ya?ml" + - "DistTasks.ya?ml" - "**.go" workflow_dispatch: repository_dispatch: @@ -43,7 +45,7 @@ jobs: - name: Build run: | - PACKAGE_NAME_PREFIX="${{ github.workflow }}" + PACKAGE_NAME_PREFIX="test" if [ "${{ github.event_name }}" = "pull_request" ]; then PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.event.number }}" fi diff --git a/Taskfile.yml b/Taskfile.yml index d9c6f2d0..ad563b7f 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -19,7 +19,7 @@ vars: sh: echo "{{now | date "20060102"}}" TAG: sh: echo "$(git tag --points-at=HEAD 2> /dev/null | head -n1)" - VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}snapshot{{end}}" + VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}{{.PACKAGE_NAME_PREFIX}}git-snapshot{{end}}" CONFIGURATION_PACKAGE: "github.com/arduino/{{.PROJECT_NAME}}/internal/configuration" LDFLAGS: >- -ldflags diff --git a/gon.config.hcl b/gon.config.hcl index 661468f2..92cc9221 100644 --- a/gon.config.hcl +++ b/gon.config.hcl @@ -10,5 +10,5 @@ sign { # Ask Gon for zip output to force notarization process to take place. # The CI will ignore the zip output, using the signed binary only. zip { - output_path = "arduino-lint.zip" + output_path = "unused.zip" } diff --git a/tests/test_all.py b/tests/test_all.py index cd5536d3..e7262812 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -206,7 +206,7 @@ def test_version(run_command): assert result.ok output_list = result.stdout.strip().split(sep=" ") version = output_list[0] - assert semver.VersionInfo.isvalid(version=version) or version == "snapshot" or "nightly" in version + assert semver.VersionInfo.isvalid(version=version) or version == "git-snapshot" or "nightly" in version dateutil.parser.isoparse(output_list[1]) result = run_command(cmd=["--version", "--format", "json"]) @@ -214,7 +214,7 @@ def test_version(run_command): version_output = json.loads(result.stdout) if version_output["version"] != "": version = version_output["version"] - assert semver.VersionInfo.isvalid(version=version) or version == "snapshot" or "nightly" in version + assert semver.VersionInfo.isvalid(version=version) or version == "git-snapshot" or "nightly" in version assert version_output["commit"] != "" dateutil.parser.isoparse(version_output["buildTimestamp"])