Skip to content

Commit f5072eb

Browse files
authored
Merge pull request #242 from per1234/sync-release-infrastructure
Finish sync of build infrastructure with "template" assets
2 parents ecd1837 + 297d992 commit f5072eb

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Diff for: .github/workflows/publish-go-tester-task.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ on:
99
- "go.mod"
1010
- "go.sum"
1111
- "Taskfile.ya?ml"
12+
- "DistTasks.ya?ml"
1213
- "**.go"
1314
pull_request:
1415
paths:
1516
- ".github/workflows/publish-go-tester-task.ya?ml"
1617
- "go.mod"
1718
- "go.sum"
1819
- "Taskfile.ya?ml"
20+
- "DistTasks.ya?ml"
1921
- "**.go"
2022
workflow_dispatch:
2123
repository_dispatch:
@@ -43,7 +45,7 @@ jobs:
4345

4446
- name: Build
4547
run: |
46-
PACKAGE_NAME_PREFIX="${{ github.workflow }}"
48+
PACKAGE_NAME_PREFIX="test"
4749
if [ "${{ github.event_name }}" = "pull_request" ]; then
4850
PACKAGE_NAME_PREFIX="$PACKAGE_NAME_PREFIX-${{ github.event.number }}"
4951
fi

Diff for: Taskfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ vars:
1919
sh: echo "{{now | date "20060102"}}"
2020
TAG:
2121
sh: echo "$(git tag --points-at=HEAD 2> /dev/null | head -n1)"
22-
VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}snapshot{{end}}"
22+
VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}{{.PACKAGE_NAME_PREFIX}}git-snapshot{{end}}"
2323
CONFIGURATION_PACKAGE: "github.com/arduino/{{.PROJECT_NAME}}/internal/configuration"
2424
LDFLAGS: >-
2525
-ldflags

Diff for: gon.config.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ sign {
1010
# Ask Gon for zip output to force notarization process to take place.
1111
# The CI will ignore the zip output, using the signed binary only.
1212
zip {
13-
output_path = "arduino-lint.zip"
13+
output_path = "unused.zip"
1414
}

Diff for: tests/test_all.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,15 @@ def test_version(run_command):
206206
assert result.ok
207207
output_list = result.stdout.strip().split(sep=" ")
208208
version = output_list[0]
209-
assert semver.VersionInfo.isvalid(version=version) or version == "snapshot" or "nightly" in version
209+
assert semver.VersionInfo.isvalid(version=version) or version == "git-snapshot" or "nightly" in version
210210
dateutil.parser.isoparse(output_list[1])
211211

212212
result = run_command(cmd=["--version", "--format", "json"])
213213
assert result.ok
214214
version_output = json.loads(result.stdout)
215215
if version_output["version"] != "":
216216
version = version_output["version"]
217-
assert semver.VersionInfo.isvalid(version=version) or version == "snapshot" or "nightly" in version
217+
assert semver.VersionInfo.isvalid(version=version) or version == "git-snapshot" or "nightly" in version
218218
assert version_output["commit"] != ""
219219
dateutil.parser.isoparse(version_output["buildTimestamp"])
220220

0 commit comments

Comments
 (0)