Skip to content

Commit 82baaf6

Browse files
d-a-vd-a-v
committed
Merge branch 'master' into arduifine
2 parents 008c75d + 16f4135 commit 82baaf6

35 files changed

+841
-92
lines changed

‎.github/workflows/arduino-stats.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# Fetch jq 1.6 as VM has only 1.5 ATM
2929
wget -q https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -O jq
3030
chmod +x jq
31-
PATH=${{ github.workspace }}:$PATH
31+
PATH="${{ github.workspace }}:$PATH"
3232
.github/tools/fetch_athena_stats.sh
3333
3434
- name: Send metrics

‎.github/workflows/i18n-nightly-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
go-version: "1.14"
2222

2323
- name: Install Taskfile
24-
uses: Arduino/actions/setup-taskfile@master
24+
uses: arduino/setup-task@v1
2525
with:
2626
repo-token: ${{ secrets.GITHUB_TOKEN }}
2727
version: 3.x

‎.github/workflows/i18n-weekly-pull.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
go get github.com/cmaglie/go.rice/rice
2626
2727
- name: Install Taskfile
28-
uses: Arduino/actions/setup-taskfile@master
28+
uses: arduino/setup-task@v1
2929
with:
3030
repo-token: ${{ secrets.GITHUB_TOKEN }}
3131
version: 3.x

‎.github/workflows/link-validation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 1
1818

1919
- name: Install Taskfile
20-
uses: Arduino/actions/setup-taskfile@master
20+
uses: arduino/setup-task@v1
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
version: 3.x

‎.github/workflows/nightly.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fetch-depth: 0
2020

2121
- name: Install Taskfile
22-
uses: arduino/actions/setup-taskfile@master
22+
uses: arduino/setup-task@v1
2323
with:
2424
repo-token: ${{ secrets.GITHUB_TOKEN }}
2525
version: 3.x
@@ -55,12 +55,12 @@ jobs:
5555
KEYCHAIN: "sign.keychain"
5656
INSTALLER_CERT_MAC_PATH: "/tmp/ArduinoCerts2020.p12"
5757
run: |
58-
echo "${{ secrets.INSTALLER_CERT_MAC_P12 }}" | base64 --decode > ${{ env.INSTALLER_CERT_MAC_PATH }}
59-
security create-keychain -p ${{ secrets.KEYCHAIN_PASSWORD }} ${{ env.KEYCHAIN }}
60-
security default-keychain -s ${{ env.KEYCHAIN }}
61-
security unlock-keychain -p ${{ secrets.KEYCHAIN_PASSWORD }} ${{ env.KEYCHAIN }}
62-
security import ${{ env.INSTALLER_CERT_MAC_PATH }} -k ${{ env.KEYCHAIN }} -f pkcs12 -A -T /usr/bin/codesign -P ${{ secrets.INSTALLER_CERT_MAC_PASSWORD }}
63-
security set-key-partition-list -S apple-tool:,apple: -s -k ${{ secrets.KEYCHAIN_PASSWORD }} ${{ env.KEYCHAIN }}
58+
echo "${{ secrets.INSTALLER_CERT_MAC_P12 }}" | base64 --decode > "${{ env.INSTALLER_CERT_MAC_PATH }}"
59+
security create-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}"
60+
security default-keychain -s "${{ env.KEYCHAIN }}"
61+
security unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}"
62+
security import "${{ env.INSTALLER_CERT_MAC_PATH }}" -k "${{ env.KEYCHAIN }}" -f pkcs12 -A -T /usr/bin/codesign -P "${{ secrets.INSTALLER_CERT_MAC_PASSWORD }}"
63+
security set-key-partition-list -S apple-tool:,apple: -s -k "${{ secrets.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}"
6464
6565
- name: Install gon for code signing and app notarization
6666
run: |
@@ -83,10 +83,10 @@ jobs:
8383
# so we need to add execution permission back until @v2 actions are released.
8484
chmod +x dist/arduino-cli_osx_darwin_amd64/arduino-cli
8585
PACKAGE_FILENAME="$(basename dist/arduino-cli_${{ github.workflow }}-*_macOS_64bit.tar.gz)"
86-
tar -czvf dist/$PACKAGE_FILENAME \
86+
tar -czvf "dist/$PACKAGE_FILENAME" \
8787
-C dist/arduino-cli_osx_darwin_amd64/ arduino-cli \
8888
-C ../../ LICENSE.txt
89-
CLI_CHECKSUM=$(shasum -a 256 dist/$PACKAGE_FILENAME | cut -d " " -f 1)
89+
CLI_CHECKSUM="$(shasum -a 256 "dist/$PACKAGE_FILENAME" | cut -d " " -f 1)"
9090
perl -pi -w -e "s/.*${PACKAGE_FILENAME}/${CLI_CHECKSUM} ${PACKAGE_FILENAME}/g;" dist/*-checksums.txt
9191
9292
- name: Upload artifacts

‎.github/workflows/publish-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v2
4545

4646
- name: Install Taskfile
47-
uses: Arduino/actions/setup-taskfile@master
47+
uses: arduino/setup-task@v1
4848
with:
4949
repo-token: ${{ secrets.GITHUB_TOKEN }}
5050
version: 3.x

‎.github/workflows/python-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v2
2121

2222
- name: Install Taskfile
23-
uses: Arduino/actions/setup-taskfile@master
23+
uses: arduino/setup-task@v1
2424
with:
2525
repo-token: ${{ secrets.GITHUB_TOKEN }}
2626
version: 3.x

‎.github/workflows/release.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
changelog-file-path: "dist/CHANGELOG.md"
2525

2626
- name: Install Taskfile
27-
uses: arduino/actions/setup-taskfile@master
27+
uses: arduino/setup-task@v1
2828
with:
2929
repo-token: ${{ secrets.GITHUB_TOKEN }}
3030
version: 3.x
@@ -58,12 +58,12 @@ jobs:
5858
KEYCHAIN: "sign.keychain"
5959
INSTALLER_CERT_MAC_PATH: "/tmp/ArduinoCerts2020.p12"
6060
run: |
61-
echo "${{ secrets.INSTALLER_CERT_MAC_P12 }}" | base64 --decode > ${{ env.INSTALLER_CERT_MAC_PATH }}
62-
security create-keychain -p ${{ secrets.KEYCHAIN_PASSWORD }} ${{ env.KEYCHAIN }}
63-
security default-keychain -s ${{ env.KEYCHAIN }}
64-
security unlock-keychain -p ${{ secrets.KEYCHAIN_PASSWORD }} ${{ env.KEYCHAIN }}
65-
security import ${{ env.INSTALLER_CERT_MAC_PATH }} -k ${{ env.KEYCHAIN }} -f pkcs12 -A -T /usr/bin/codesign -P ${{ secrets.INSTALLER_CERT_MAC_PASSWORD }}
66-
security set-key-partition-list -S apple-tool:,apple: -s -k ${{ secrets.KEYCHAIN_PASSWORD }} ${{ env.KEYCHAIN }}
61+
echo "${{ secrets.INSTALLER_CERT_MAC_P12 }}" | base64 --decode > "${{ env.INSTALLER_CERT_MAC_PATH }}"
62+
security create-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}"
63+
security default-keychain -s "${{ env.KEYCHAIN }}"
64+
security unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}"
65+
security import "${{ env.INSTALLER_CERT_MAC_PATH }}" -k "${{ env.KEYCHAIN }}" -f pkcs12 -A -T /usr/bin/codesign -P "${{ secrets.INSTALLER_CERT_MAC_PASSWORD }}"
66+
security set-key-partition-list -S apple-tool:,apple: -s -k "${{ secrets.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}"
6767
6868
- name: Install gon for code signing and app notarization
6969
run: |
@@ -85,11 +85,11 @@ jobs:
8585
# GitHub's upload/download-artifact@v1 actions don't preserve file permissions,
8686
# so we need to add execution permission back until @v2 actions are released.
8787
chmod +x dist/arduino-cli_osx_darwin_amd64/arduino-cli
88-
TAG=${GITHUB_REF/refs\/tags\//}
89-
tar -czvf dist/arduino-cli_${TAG}_macOS_64bit.tar.gz \
88+
TAG="${GITHUB_REF/refs\/tags\//}"
89+
tar -czvf "dist/arduino-cli_${TAG}_macOS_64bit.tar.gz" \
9090
-C dist/arduino-cli_osx_darwin_amd64/ arduino-cli \
9191
-C ../../ LICENSE.txt
92-
CLI_CHECKSUM=$(shasum -a 256 dist/arduino-cli_${TAG}_macOS_64bit.tar.gz | cut -d " " -f 1)
92+
CLI_CHECKSUM="$(shasum -a 256 "dist/arduino-cli_${TAG}_macOS_64bit.tar.gz" | cut -d " " -f 1)"
9393
perl -pi -w -e "s/.*arduino-cli_${TAG}_macOS_64bit.tar.gz/${CLI_CHECKSUM} arduino-cli_${TAG}_macOS_64bit.tar.gz/g;" dist/*-checksums.txt
9494
9595
- name: Upload artifacts
@@ -116,11 +116,11 @@ jobs:
116116
- name: Read CHANGELOG
117117
id: changelog
118118
run: |
119-
body=$(cat dist/CHANGELOG.md)
119+
body="$(cat dist/CHANGELOG.md)"
120120
body="${body//'%'/'%25'}"
121121
body="${body//$'\n'/'%0A'}"
122122
body="${body//$'\r'/'%0D'}"
123-
echo $body
123+
echo "$body"
124124
echo "::set-output name=BODY::$body"
125125
126126
- name: Identify Prerelease
@@ -130,7 +130,7 @@ jobs:
130130
run: |
131131
wget -q -P /tmp https://github.com/fsaintjacques/semver-tool/archive/3.0.0.zip
132132
unzip -p /tmp/3.0.0.zip semver-tool-3.0.0/src/semver >/tmp/semver && chmod +x /tmp/semver
133-
if [[ $(/tmp/semver get prerel ${GITHUB_REF/refs\/tags\//}) ]]; then echo "::set-output name=IS_PRE::true"; fi
133+
if [[ "$(/tmp/semver get prerel "${GITHUB_REF/refs\/tags\//}")" ]]; then echo "::set-output name=IS_PRE::true"; fi
134134
135135
- name: Create Github Release
136136
id: create_release

‎.github/workflows/test.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
shell: bash
3737

3838
- name: Install Taskfile
39-
uses: Arduino/actions/setup-taskfile@master
39+
uses: arduino/setup-task@v1
4040
with:
4141
repo-token: ${{ secrets.GITHUB_TOKEN }}
4242
version: 3.x
@@ -124,7 +124,7 @@ jobs:
124124
fetch-depth: 0
125125

126126
- name: Install Taskfile
127-
uses: arduino/actions/setup-taskfile@master
127+
uses: arduino/setup-task@v1
128128
with:
129129
repo-token: ${{ secrets.GITHUB_TOKEN }}
130130
version: 3.x
@@ -182,12 +182,6 @@ jobs:
182182
name: Linux_ARM64
183183
path: dist/*Linux_ARM64.tar.gz
184184

185-
- name: Upload Linux ARM64 bit artifact
186-
uses: actions/upload-artifact@v2
187-
with:
188-
name: Linux_ARM64
189-
path: dist/*Linux_ARM64.tar.gz
190-
191185
- name: Upload MacOS 64 bit artifact
192186
uses: actions/upload-artifact@v2
193187
with:

‎.github/workflows/validate-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v2
3232

3333
- name: Install Taskfile
34-
uses: Arduino/actions/setup-taskfile@master
34+
uses: arduino/setup-task@v1
3535
with:
3636
repo-token: ${{ secrets.GITHUB_TOKEN }}
3737
version: 3.x

0 commit comments

Comments
 (0)