Skip to content
This repository was archived by the owner on Feb 10, 2024. It is now read-only.

Commit aeed3ca

Browse files
committed
2.1.1
1 parent 71e4c3d commit aeed3ca

File tree

3 files changed

+33
-31
lines changed

3 files changed

+33
-31
lines changed

README-DEVELOPER.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ git clone https://github.com/your_git_account/arduino-ide
2828
cd arduino-ide
2929
patch -p1 < ../arduino-ide-raspberrypi/self_hosted_runner.patch
3030
git add .github/workflows/build.yml
31-
git add arduino-ide-extension/scripts/download-ls.js
3231
git add arduino-ide-extension/src/test/node/boards-service-impl.slow-test.ts
32+
git add arduino-ide-extension/src/test/node/test-bindings.ts
3333
git commit -m arm64
3434
git push
35-
git tag -a 2.1.0-arm64 -m self-hosted
35+
git tag -a 2.1.1-arm64 -m self-hosted
3636
git push --tags
3737
```
3838

docker-github-actions-runner.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
commit eae167aef3bb3ea20e44026174343562a5ce61b2
1+
commit b387877134205ea0b21cea7fc5b1a894899c54eb
22
Author: Koen De Vleeschauwer <kdv@kdvelectronics.eu>
3-
Date: Wed Apr 19 18:45:36 2023 +0200
3+
Date: Fri Jun 30 19:35:40 2023 +0200
44

55
arduino-ide
66

77
diff --git a/Dockerfile b/Dockerfile
8-
index 7bd4a1c..e0f54a3 100644
8+
index 39adc19..c1f2f1a 100644
99
--- a/Dockerfile
1010
+++ b/Dockerfile
1111
@@ -1,5 +1,5 @@
@@ -17,7 +17,7 @@ index 7bd4a1c..e0f54a3 100644
1717
ENV AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache
1818
@@ -7,7 +7,7 @@ RUN mkdir -p /opt/hostedtoolcache
1919

20-
ARG GH_RUNNER_VERSION="2.303.0"
20+
ARG GH_RUNNER_VERSION="2.305.0"
2121

2222
-ARG TARGETPLATFORM
2323
+ARG TARGETPLATFORM="linux/arm64"
@@ -37,11 +37,11 @@ index 7bd4a1c..e0f54a3 100644
3737
ENTRYPOINT ["/entrypoint.sh"]
3838
CMD ["./bin/Runner.Listener", "run", "--startuptype", "service"]
3939
diff --git a/entrypoint.sh b/entrypoint.sh
40-
index 5196b7d..193da43 100644
40+
index 5ae7108..32e5755 100644
4141
--- a/entrypoint.sh
4242
+++ b/entrypoint.sh
43-
@@ -166,6 +166,10 @@ if [[ ${_DISABLE_AUTOMATIC_DEREGISTRATION} == "false" ]]; then
44-
trap deregister_runner SIGINT SIGQUIT SIGTERM INT TERM QUIT
43+
@@ -173,6 +173,10 @@ if [[ ${_START_DOCKER_SERVICE} == "true" ]]; then
44+
service docker start
4545
fi
4646

4747
+. $HOME/.nvm/nvm.sh

self_hosted_runner.patch

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
commit 94f6b0dfaf5d5871d56d27a2bda0205a61f1e261
2+
Author: Koen De Vleeschauwer <kdv@kdvelectronics.eu>
3+
Date: Fri Jun 30 19:31:14 2023 +0200
4+
5+
arm64
6+
17
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
2-
index 77c506b..d5b63df 100644
8+
index 28e07c6..28549c2 100644
39
--- a/.github/workflows/build.yml
410
+++ b/.github/workflows/build.yml
511
@@ -39,17 +39,18 @@ jobs:
@@ -9,7 +15,7 @@ index 77c506b..d5b63df 100644
915
- - os: windows-2019
1016
- certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
1117
- certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
12-
- certificate-extension: pfx # File extension for the certificate.
18+
- certificate-extension: pfx # File extension for the certificate.
1319
- - os: ubuntu-20.04
1420
- - os: macos-latest
1521
- # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
@@ -20,7 +26,7 @@ index 77c506b..d5b63df 100644
2026
+# - os: windows-2019
2127
+# certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
2228
+# certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
23-
+# certificate-extension: pfx # File extension for the certificate.
29+
+# certificate-extension: pfx # File extension for the certificate.
2430
+# - os: ubuntu-20.04
2531
+# - os: macos-latest
2632
+# # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
@@ -51,32 +57,28 @@ index 77c506b..d5b63df 100644
5157
- path: '*macOS_64bit.dmg'
5258
name: macOS_dmg
5359
- path: '*macOS_64bit.zip'
54-
diff --git a/arduino-ide-extension/scripts/download-ls.js b/arduino-ide-extension/scripts/download-ls.js
55-
index 991dfb0..dbfe6d4 100755
56-
--- a/arduino-ide-extension/scripts/download-ls.js
57-
+++ b/arduino-ide-extension/scripts/download-ls.js
58-
@@ -88,6 +88,12 @@
59-
lsSuffix = 'Linux_64bit.tar.gz';
60-
clangdSuffix = 'Linux_64bit';
61-
break;
62-
+ case 'linux-arm64':
63-
+ clangdExecutablePath = path.join(build, 'clangd');
64-
+ clangFormatExecutablePath = path.join(build, 'clang-format');
65-
+ lsSuffix = 'Linux_ARM64.tar.gz';
66-
+ clangdSuffix = 'Linux_ARM64';
67-
+ break;
68-
case 'win32-x64':
69-
clangdExecutablePath = path.join(build, 'clangd.exe');
70-
clangFormatExecutablePath = path.join(build, 'clang-format.exe');
7160
diff --git a/arduino-ide-extension/src/test/node/boards-service-impl.slow-test.ts b/arduino-ide-extension/src/test/node/boards-service-impl.slow-test.ts
72-
index fe89cc4..c217487 100644
61+
index de243d2..557de7b 100644
7362
--- a/arduino-ide-extension/src/test/node/boards-service-impl.slow-test.ts
7463
+++ b/arduino-ide-extension/src/test/node/boards-service-impl.slow-test.ts
75-
@@ -25,6 +25,7 @@ describe('boards-service-impl', () => {
64+
@@ -20,6 +20,7 @@ describe('boards-service-impl', () => {
7665

7766
describe('search', () => {
7867
it('should run search', async function () {
7968
+ this.timeout(20_000);
8069
const result = await boardService.search({});
8170
expect(result).is.not.empty;
8271
});
72+
diff --git a/arduino-ide-extension/src/test/node/test-bindings.ts b/arduino-ide-extension/src/test/node/test-bindings.ts
73+
index 30d8513..c83ef9a 100644
74+
--- a/arduino-ide-extension/src/test/node/test-bindings.ts
75+
+++ b/arduino-ide-extension/src/test/node/test-bindings.ts
76+
@@ -409,7 +409,7 @@ export async function startDaemon(
77+
configService.onStart();
78+
daemon.onStart();
79+
await Promise.all([
80+
- waitForEvent(daemon.onDaemonStarted, 10_000),
81+
+ waitForEvent(daemon.onDaemonStarted, 20_000),
82+
coreClientProvider.client,
83+
]);
84+
if (startCustomizations) {

0 commit comments

Comments
 (0)