Skip to content

Commit 882b13f

Browse files
authored
Merge pull request #270 from per1234/sync-assets
Sync project assets from the standardized "template" versions
2 parents f04d7ea + 0ba7657 commit 882b13f

7 files changed

+24
-15
lines changed

.codespellrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[codespell]
44
# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
55
ignore-words-list = ot,propert
6+
skip = ./.git,**/go.mod,**/go.sum,./package-lock.json,./poetry.lock,./yarn.lock,./arduino-lint,./arduino-lint.exe,./internal/rule/rulefunction/testdata/libraries/MisspelledSentenceParagraphValue/library.properties,./site
67
builtin = clear,informal,en-GB_to_en-US
78
check-filenames =
89
check-hidden =
9-
skip = ./.git,**/go.mod,**/go.sum,./package-lock.json,./poetry.lock,./yarn.lock,./arduino-lint,./arduino-lint.exe,./internal/rule/rulefunction/testdata/libraries/MisspelledSentenceParagraphValue/library.properties,./site

.ecrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Exclude": [
3-
"LICENSE.txt",
4-
"poetry.lock",
3+
"^LICENSE\\.txt$",
4+
"^poetry\\.lock$",
55
"^internal/rule/schema/schemadata/bindata.go$",
66
"^internal/rule/schema/testdata/bindata.go$"
77
]

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ indent_style = space
5656
indent_size = 2
5757
indent_style = space
5858

59-
[.gitmodules]
59+
[{.gitconfig,.gitmodules}]
6060
indent_style = tab

.github/workflows/publish-go-nightly-task.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,14 @@ jobs:
103103
chmod +x "${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/${{ env.PROJECT_NAME }}"
104104
PACKAGE_FILENAME="$(basename ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_nightly-*_macOS_64bit.tar.gz)"
105105
tar -czvf "${{ env.DIST_DIR }}/$PACKAGE_FILENAME" \
106-
-C "${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/" "${{ env.PROJECT_NAME }}" \
107-
-C ../../ LICENSE.txt
106+
-C "${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/" "${{ env.PROJECT_NAME }}" \
107+
-C ../../ LICENSE.txt
108108
CHECKSUM="$(shasum -a 256 ${{ env.DIST_DIR }}/$PACKAGE_FILENAME | cut -d " " -f 1)"
109-
perl -pi -w -e "s/.*${PACKAGE_FILENAME}/${CHECKSUM} ${PACKAGE_FILENAME}/g;" ${{ env.DIST_DIR }}/*-checksums.txt
109+
perl \
110+
-pi \
111+
-w \
112+
-e "s/.*${PACKAGE_FILENAME}/${CHECKSUM} ${PACKAGE_FILENAME}/g;" \
113+
${{ env.DIST_DIR }}/*-checksums.txt
110114
111115
- name: Upload artifacts
112116
uses: actions/upload-artifact@v2

.github/workflows/publish-go-tester-task.yml

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ jobs:
6060
steps:
6161
- name: Checkout repository
6262
uses: actions/checkout@v2
63-
with:
64-
fetch-depth: 0
6563

6664
- name: Install Task
6765
uses: arduino/setup-task@v1

.github/workflows/release-go-task.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,14 @@ jobs:
108108
chmod +x ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/${{ env.PROJECT_NAME }}
109109
TAG="${GITHUB_REF/refs\/tags\//}"
110110
tar -czvf "${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz" \
111-
-C ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/ ${{ env.PROJECT_NAME }} \
112-
-C ../../ LICENSE.txt
111+
-C ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_osx_darwin_amd64/ ${{ env.PROJECT_NAME }} \
112+
-C ../../ LICENSE.txt
113113
CHECKSUM="$(shasum -a 256 ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz | cut -d " " -f 1)"
114-
perl -pi -w -e "s/.*${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz/${CHECKSUM} ${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz/g;" ${{ env.DIST_DIR }}/*-checksums.txt
114+
perl \
115+
-pi \
116+
-w \
117+
-e "s/.*${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz/${CHECKSUM} ${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz/g;" \
118+
${{ env.DIST_DIR }}/*-checksums.txt
115119
116120
- name: Upload artifacts
117121
uses: actions/upload-artifact@v2
@@ -125,9 +129,6 @@ jobs:
125129
needs: notarize-macos
126130

127131
steps:
128-
- name: Checkout repository
129-
uses: actions/checkout@v2
130-
131132
- name: Download artifact
132133
uses: actions/download-artifact@v2
133134
with:
@@ -150,6 +151,8 @@ jobs:
150151
bodyFile: ${{ env.DIST_DIR }}/CHANGELOG.md
151152
draft: false
152153
prerelease: ${{ steps.prerelease.outputs.IS_PRE }}
154+
# NOTE: "Artifact is a directory" warnings are expected and don't indicate a problem
155+
# (all the files we need are in the DIST_DIR root)
153156
artifacts: ${{ env.DIST_DIR }}/*
154157

155158
- name: Upload release files on Arduino downloads servers

Taskfile.yml

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ vars:
3939
-X {{.CONFIGURATION_PACKAGE}}.Commit={{.COMMIT}}
4040
-X {{.CONFIGURATION_PACKAGE}}.Timestamp={{.TIMESTAMP}}
4141
'
42+
# `-ldflags` flag to use for `go test` command
43+
TEST_LDFLAGS:
4244

4345
tasks:
4446
build:
@@ -107,6 +109,7 @@ tasks:
107109
deps:
108110
- task: go:cli-docs
109111
- task: go:rule-docs
112+
cmds:
110113
# Make the formatting consistent with the non-generated Markdown
111114
- task: general:format-prettier
112115

@@ -225,6 +228,7 @@ tasks:
225228
-run '{{default ".*" .GO_TEST_REGEX}}' \
226229
{{default "-timeout 10m -coverpkg=./... -covermode=atomic" .GO_TEST_FLAGS}} \
227230
-coverprofile=coverage_unit.txt \
231+
{{.TEST_LDFLAGS}} \
228232
{{default .DEFAULT_GO_PACKAGES .GO_PACKAGES}}
229233
230234
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/test-go-integration-task/Taskfile.yml

0 commit comments

Comments
 (0)