From 9fd6c97559232984533256e031e5d7c160e983b4 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 5 Feb 2022 23:57:27 +0000 Subject: [PATCH 01/16] new js-controller release --- .github/dependencies/.js-controller-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.js-controller-version b/.github/dependencies/.js-controller-version index 593cb7a..7cc166d 100644 --- a/.github/dependencies/.js-controller-version +++ b/.github/dependencies/.js-controller-version @@ -1 +1 @@ -v3.3.22 +v4.0.3 From 898c58ce7e21357295a5dde3d151208e0d989114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 21:27:04 +0100 Subject: [PATCH 02/16] Create testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/testing-docker-image.yml diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml new file mode 100644 index 0000000..e688600 --- /dev/null +++ b/.github/workflows/testing-docker-image.yml @@ -0,0 +1,42 @@ +# Github action for testing the Docker image +name: Testing Docker image + +on: + workflow_dispatch: + +jobs: + test-docker-image: + runs-on: ubuntu-latest + steps: + - name: Testing with docker run + run: | + docker run -d -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest + sleep 30 + docker logs iobroker >& testrun.log + curl --insecure http://127.0.0.1:8081 2> /dev/null | grep 'Admin' &> /dev/null || exit 1 + + - name: Send notification + uses: dawidd6/action-send-mail@v3 + with: + # Required mail server address: + server_address: ${{secrets.MAIL_SERVER}} + # Required mail server port: + server_port: 465 + # Optional (recommended): mail server username: + username: ${{secrets.MAIL_USER}} + # Optional (recommended) mail server password: + password: ${{secrets.MAIL_PASS}} + # Required mail subject: + subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image + # Required recipients' addresses: + to: andre@buanet.de + # Required sender full name (address can be skipped): + from: GitHub Actions Notification + # Optional whether this connection use TLS (default is true if server_port is 465) + secure: true + # Optional plain body: + body: Job completed successfully! + # Optional unsigned/invalid certificates allowance: + ignore_cert: true + # Optional attachments: + attachments: testrun.log From 1a92ab16dd9598fa84e8ed52640faec976f509d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 21:42:56 +0100 Subject: [PATCH 03/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index e688600..daecbc5 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -19,7 +19,7 @@ jobs: uses: dawidd6/action-send-mail@v3 with: # Required mail server address: - server_address: ${{secrets.MAIL_SERVER}} + server_address: mail.buanet.de # Required mail server port: server_port: 465 # Optional (recommended): mail server username: From 87137450db70b331db4d8cc1ed275817be890c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 21:48:52 +0100 Subject: [PATCH 04/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 59 ++++++++++++++-------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index daecbc5..1b2626f 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -15,28 +15,43 @@ jobs: docker logs iobroker >& testrun.log curl --insecure http://127.0.0.1:8081 2> /dev/null | grep 'Admin' &> /dev/null || exit 1 - - name: Send notification - uses: dawidd6/action-send-mail@v3 + - name: Send email + uses: devellany/send-mailer@v1.0.2 with: - # Required mail server address: - server_address: mail.buanet.de - # Required mail server port: - server_port: 465 - # Optional (recommended): mail server username: - username: ${{secrets.MAIL_USER}} - # Optional (recommended) mail server password: + host: mail.buanet.de + account: ${{secrets.MAIL_USER}} password: ${{secrets.MAIL_PASS}} - # Required mail subject: - subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image - # Required recipients' addresses: + sender: devellany + from: noreply@buanet.de to: andre@buanet.de - # Required sender full name (address can be skipped): - from: GitHub Actions Notification - # Optional whether this connection use TLS (default is true if server_port is 465) - secure: true - # Optional plain body: - body: Job completed successfully! - # Optional unsigned/invalid certificates allowance: - ignore_cert: true - # Optional attachments: - attachments: testrun.log + subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image + body: Test + contentType: text/html + attachments: file://testrun.log + + +# - name: Send notification +# uses: dawidd6/action-send-mail@v3 +# with: +# # Required mail server address: +# server_address: mail.buanet.de +# # Required mail server port: +# server_port: 465 +# # Optional (recommended): mail server username: +# username: ${{secrets.MAIL_USER}} +# # Optional (recommended) mail server password: +# password: ${{secrets.MAIL_PASS}} +# # Required mail subject: +# subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image +# # Required recipients' addresses: +# to: andre@buanet.de +# # Required sender full name (address can be skipped): +# from: GitHub Actions Notification +# # Optional whether this connection use TLS (default is true if server_port is 465) +# secure: true +# # Optional plain body: +# body: Job completed successfully! +# # Optional unsigned/invalid certificates allowance: +# ignore_cert: true +# # Optional attachments: +# attachments: testrun.log From 833ec7515eb315d99ebd0bb3134e2bac3e7c484a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 21:51:26 +0100 Subject: [PATCH 05/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index 1b2626f..c811242 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -16,7 +16,7 @@ jobs: curl --insecure http://127.0.0.1:8081 2> /dev/null | grep 'Admin' &> /dev/null || exit 1 - name: Send email - uses: devellany/send-mailer@v1.0.2 + uses: devellany/send-mail@v1.0.2 with: host: mail.buanet.de account: ${{secrets.MAIL_USER}} From 118892975ad5c88cdfc8d93450dd6f105740627c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 21:55:46 +0100 Subject: [PATCH 06/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index c811242..5973ac7 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -16,12 +16,12 @@ jobs: curl --insecure http://127.0.0.1:8081 2> /dev/null | grep 'Admin' &> /dev/null || exit 1 - name: Send email - uses: devellany/send-mail@v1.0.2 + uses: devellany/send-mail@v1 with: host: mail.buanet.de account: ${{secrets.MAIL_USER}} password: ${{secrets.MAIL_PASS}} - sender: devellany + sender: Notify from: noreply@buanet.de to: andre@buanet.de subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image @@ -29,7 +29,6 @@ jobs: contentType: text/html attachments: file://testrun.log - # - name: Send notification # uses: dawidd6/action-send-mail@v3 # with: From bf5288071b0944d89c5910b335bfa6ea664cda98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 21:57:05 +0100 Subject: [PATCH 07/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index 5973ac7..034fea8 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -16,7 +16,7 @@ jobs: curl --insecure http://127.0.0.1:8081 2> /dev/null | grep 'Admin' &> /dev/null || exit 1 - name: Send email - uses: devellany/send-mail@v1 + uses: devellany/send-mail@v1.0.2 with: host: mail.buanet.de account: ${{secrets.MAIL_USER}} From 98bd35cc52845f070d6872ecd92c5b3c6b4afc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 22:00:17 +0100 Subject: [PATCH 08/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index 034fea8..8f9e3da 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -24,7 +24,7 @@ jobs: sender: Notify from: noreply@buanet.de to: andre@buanet.de - subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image + subject: GitHub Actions - ioBroker.Docker - Testing Docker image body: Test contentType: text/html attachments: file://testrun.log From 543343359e67d798ffc92156f9b8181a1a5b9fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Sun, 6 Feb 2022 22:09:23 +0100 Subject: [PATCH 09/16] Update testing-docker-image.yml --- .github/workflows/testing-docker-image.yml | 57 +++++++--------------- 1 file changed, 17 insertions(+), 40 deletions(-) diff --git a/.github/workflows/testing-docker-image.yml b/.github/workflows/testing-docker-image.yml index 8f9e3da..aedbc57 100644 --- a/.github/workflows/testing-docker-image.yml +++ b/.github/workflows/testing-docker-image.yml @@ -10,47 +10,24 @@ jobs: steps: - name: Testing with docker run run: | + echo "[LOG] Starting ioBroker Container..." docker run -d -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest + echo "[LOG] Done." + echo ' ' + echo "[LOG] Waiting for Startup Script..." sleep 30 + echo "[LOG] Done." + echo ' ' + echo "[LOG] Writing Logs..." docker logs iobroker >& testrun.log + echo "[LOG] Done." + echo ' ' + echo "[LOG] Checking Web UI..." curl --insecure http://127.0.0.1:8081 2> /dev/null | grep 'Admin' &> /dev/null || exit 1 - - - name: Send email - uses: devellany/send-mail@v1.0.2 - with: - host: mail.buanet.de - account: ${{secrets.MAIL_USER}} - password: ${{secrets.MAIL_PASS}} - sender: Notify - from: noreply@buanet.de - to: andre@buanet.de - subject: GitHub Actions - ioBroker.Docker - Testing Docker image - body: Test - contentType: text/html - attachments: file://testrun.log - -# - name: Send notification -# uses: dawidd6/action-send-mail@v3 -# with: -# # Required mail server address: -# server_address: mail.buanet.de -# # Required mail server port: -# server_port: 465 -# # Optional (recommended): mail server username: -# username: ${{secrets.MAIL_USER}} -# # Optional (recommended) mail server password: -# password: ${{secrets.MAIL_PASS}} -# # Required mail subject: -# subject: \[GitHub Actions\] ioBroker.Docker - Testing Docker image -# # Required recipients' addresses: -# to: andre@buanet.de -# # Required sender full name (address can be skipped): -# from: GitHub Actions Notification -# # Optional whether this connection use TLS (default is true if server_port is 465) -# secure: true -# # Optional plain body: -# body: Job completed successfully! -# # Optional unsigned/invalid certificates allowance: -# ignore_cert: true -# # Optional attachments: -# attachments: testrun.log + echo "[LOG] Done." + echo ' ' + echo "[LOG] Output testrun.log:" + cat testrun.log + echo ' ' + echo "[LOG] Test sucesssful." + echo ' ' From 2effdf5feaa65e234bb004e7b5ba3a338107837e Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 6 Feb 2022 23:45:46 +0000 Subject: [PATCH 10/16] new js-controller release --- .github/dependencies/.js-controller-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.js-controller-version b/.github/dependencies/.js-controller-version index 7cc166d..f05f17c 100644 --- a/.github/dependencies/.js-controller-version +++ b/.github/dependencies/.js-controller-version @@ -1 +1 @@ -v4.0.3 +v4.0.4 From 60b4b10965fcc2486cd6f53f8baff63b2ebac388 Mon Sep 17 00:00:00 2001 From: buanet Date: Tue, 8 Feb 2022 23:45:42 +0000 Subject: [PATCH 11/16] new js-controller release --- .github/dependencies/.js-controller-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.js-controller-version b/.github/dependencies/.js-controller-version index f05f17c..e5d4cf3 100644 --- a/.github/dependencies/.js-controller-version +++ b/.github/dependencies/.js-controller-version @@ -1 +1 @@ -v4.0.4 +v4.0.5 From f312524d71eb12c2818316d340faa07708174ca7 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 9 Feb 2022 23:45:55 +0000 Subject: [PATCH 12/16] new js-controller release --- .github/dependencies/.js-controller-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.js-controller-version b/.github/dependencies/.js-controller-version index e5d4cf3..c5c9ea8 100644 --- a/.github/dependencies/.js-controller-version +++ b/.github/dependencies/.js-controller-version @@ -1 +1 @@ -v4.0.5 +v4.0.6 From a5b0ab5b7a0271d90964c18ac477e0109ea84042 Mon Sep 17 00:00:00 2001 From: buanet Date: Thu, 10 Feb 2022 23:45:34 +0000 Subject: [PATCH 13/16] new js-controller release --- .github/dependencies/.js-controller-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.js-controller-version b/.github/dependencies/.js-controller-version index c5c9ea8..35ca7be 100644 --- a/.github/dependencies/.js-controller-version +++ b/.github/dependencies/.js-controller-version @@ -1 +1 @@ -v4.0.6 +v4.0.7 From f00aff57a17b567ef4cf607bb797c7e67bcbd8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Fri, 11 Feb 2022 08:01:42 +0100 Subject: [PATCH 14/16] add logging --- .github/workflows/check-js-controller-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-js-controller-release.yml b/.github/workflows/check-js-controller-release.yml index b8c2c04..a9bfc8d 100644 --- a/.github/workflows/check-js-controller-release.yml +++ b/.github/workflows/check-js-controller-release.yml @@ -19,6 +19,7 @@ jobs: run: | curl -sL https://api.github.com/repos/ioBroker/ioBroker.js-controller/releases/latest | \ jq -r ".tag_name" > .github/dependencies/.js-controller-version + echo "[LOG] Fetched js-controller version is $(cat .github/dependencies/.js-controller-version)" - name: Check for modified files id: git-check @@ -46,4 +47,4 @@ jobs: with: workflow: Build debian latest (iobroker) repo: buanet/ioBroker.docker - token: ${{ secrets.ACTIONS_PAT }} \ No newline at end of file + token: ${{ secrets.ACTIONS_PAT }} From 641be7cebef0f7a0f26dc4f3ceca89db43b6d0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Germann?= Date: Fri, 11 Feb 2022 08:32:03 +0100 Subject: [PATCH 15/16] get stable js-controller version --- .github/workflows/check-js-controller-release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-js-controller-release.yml b/.github/workflows/check-js-controller-release.yml index a9bfc8d..b7b3123 100644 --- a/.github/workflows/check-js-controller-release.yml +++ b/.github/workflows/check-js-controller-release.yml @@ -17,8 +17,10 @@ jobs: - name: Fetch js-controller release version run: | - curl -sL https://api.github.com/repos/ioBroker/ioBroker.js-controller/releases/latest | \ - jq -r ".tag_name" > .github/dependencies/.js-controller-version + curl -sL https://repo.iobroker.live/sources-dist.json | \ + jq -r '."js-controller".version' > .github/dependencies/.js-controller-version + # curl -sL https://api.github.com/repos/ioBroker/ioBroker.js-controller/releases/latest | \ + # jq -r ".tag_name" > .github/dependencies/.js-controller-version echo "[LOG] Fetched js-controller version is $(cat .github/dependencies/.js-controller-version)" - name: Check for modified files From 57c3fe23717d902a250dd3debb540bee42b513bb Mon Sep 17 00:00:00 2001 From: buanet Date: Fri, 11 Feb 2022 07:56:23 +0000 Subject: [PATCH 16/16] new js-controller release --- .github/dependencies/.js-controller-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.js-controller-version b/.github/dependencies/.js-controller-version index 35ca7be..c21e5b4 100644 --- a/.github/dependencies/.js-controller-version +++ b/.github/dependencies/.js-controller-version @@ -1 +1 @@ -v4.0.7 +3.3.22