From 517e67255da71995827dd913bcbfe1653f3fbf2d Mon Sep 17 00:00:00 2001 From: Northern Man <19808920+NorthernMan54@users.noreply.github.com> Date: Sat, 1 Jul 2023 09:01:59 -0400 Subject: [PATCH 1/6] Transition from oznu to homebridge --- .github/workflows/main.yml | 8 ++++---- INFO.sh | 8 ++++---- README.md | 12 ++++++------ repo/index.js | 10 +++++----- ui/config | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 631f143..f27b55e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,15 +70,15 @@ jobs: ### Recommended Post-Install Steps: - * [Enable compiling native modules](https://github.com/oznu/homebridge-syno-spk/wiki/DSM-7:-Enable-Compiling-Of-Native-Modules) - * [Install ffmpeg with libfdk_aac](https://github.com/oznu/homebridge-syno-spk/wiki/DSM-7:-ffmpeg-with-libfdk_aac) - * [Install git](https://github.com/oznu/homebridge-syno-spk/wiki/DSM-7:-Install-git) + * [Enable compiling native modules](https://github.com/homebridge/homebridge-syno-spk/wiki/DSM-7:-Enable-Compiling-Of-Native-Modules) + * [Install ffmpeg with libfdk_aac](https://github.com/homebridge/homebridge-syno-spk/wiki/DSM-7:-ffmpeg-with-libfdk_aac) + * [Install git](https://github.com/homebridge/homebridge-syno-spk/wiki/DSM-7:-Install-git) --- - *If you like the [Homebridge UI](https://github.com/oznu/homebridge-config-ui-x) or the [Homebridge Synology Package Installer](https://github.com/oznu/homebridge-syno-spk) please consider [donating via PayPal](https://paypal.me/oznu) ❤️* + *If you like the [Homebridge UI](https://github.com/homebridge/homebridge-config-ui-x) or the [Homebridge Synology Package Installer](https://github.com/homebridge/homebridge-syno-spk) please consider [donating via PayPal](https://paypal.me/oznu) ❤️* diff --git a/INFO.sh b/INFO.sh index 39da69d..9620eb0 100755 --- a/INFO.sh +++ b/INFO.sh @@ -6,12 +6,12 @@ package="homebridge" version=${SPK_PACKAGE_VERSION:-1.0.0} os_min_ver="7.0-40761" -maintainer="oznu" +maintainer="homebridge" thirdparty="yes" arch="${SPK_ARCH:-x86_64}" reloadui="yes" dsmuidir="ui" -dsmappname="oznu.homebridge" +dsmappname="homebridge.homebridge" silent_install="no" silent_upgrade="no" adminprotocol="http" @@ -20,8 +20,8 @@ adminport="8581" displayname="Homebridge" description="Homebridge on Synology DSM." -maintainer_url="https://github.com/oznu/homebridge-syno-spk" -support_url="https://github.com/oznu/homebridge-syno-spk" +maintainer_url="https://github.com/homebridge/homebridge-syno-spk" +support_url="https://github.com/homebridge/homebridge-syno-spk" [ "$(caller)" != "0 NULL" ] && return 0 pkg_dump_info diff --git a/README.md b/README.md index 6279246..be0b01c 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@

-[![GitHub release](https://img.shields.io/github/release/oznu/homebridge-syno-spk.svg)](https://github.com/oznu/homebridge-syno-spk/releases/latest) -[![Build](https://github.com/oznu/homebridge-syno-spk/workflows/Build/badge.svg)](https://github.com/oznu/homebridge-syno-spk/actions) +[![GitHub release](https://img.shields.io/github/release/homebridge/homebridge-syno-spk.svg)](https://github.com/homebridge/homebridge-syno-spk/releases/latest) +[![Build](https://github.com/homebridge/homebridge-syno-spk/workflows/Build/badge.svg)](https://github.com/homebridge/homebridge-syno-spk/actions) [![Donate](https://badgen.net/badge/donate/paypal/yellow)](https://paypal.me/oznu) # Homebridge Package for Synology DSM @@ -49,15 +49,15 @@ If you have the Synology Firewall enabled, make a rule to allow access to port 8 ### Recommended Optional Steps: -* [Enable compiling native modules](https://github.com/oznu/homebridge-syno-spk/wiki/DSM-7:-Enable-Compiling-Of-Native-Modules) -* [Install ffmpeg with libfdk_aac](https://github.com/oznu/homebridge-syno-spk/wiki/DSM-7:-ffmpeg-with-libfdk_aac) -* [Install git](https://github.com/oznu/homebridge-syno-spk/wiki/DSM-7:-Install-git) +* [Enable compiling native modules](https://github.com/homebridge/homebridge-syno-spk/wiki/DSM-7:-Enable-Compiling-Of-Native-Modules) +* [Install ffmpeg with libfdk_aac](https://github.com/homebridge/homebridge-syno-spk/wiki/DSM-7:-ffmpeg-with-libfdk_aac) +* [Install git](https://github.com/homebridge/homebridge-syno-spk/wiki/DSM-7:-Install-git) ## Issues If you have an issue with the installation of Homebridge using this package please raise an issue on this project's GitHub page. For everything else: -* Homebridge UI Issues: [oznu/homebridge-config-ui-x](https://github.com/oznu/homebridge-config-ui-x) +* Homebridge UI Issues: [homebridge/homebridge-config-ui-x](https://github.com/homebridge/homebridge-config-ui-x) * General Homebridge Issues: [nfarina/homebridge](https://github.com/nfarina/homebridge) * For problems with individual plugins please raise issues on the relevant GitHub project page. diff --git a/repo/index.js b/repo/index.js index 08b05af..e599466 100644 --- a/repo/index.js +++ b/repo/index.js @@ -35,12 +35,12 @@ const path = require('path'); price: 0, download_count: 56691, recent_download_count: 1138, - link: `https://github.com/oznu/homebridge-syno-spk/releases/download/${version}/${spk}`, + link: `https://github.com/homebridge/homebridge-syno-spk/releases/download/${version}/${spk}`, size: fileStat.size, md5: md5sum, thumbnail: [ - 'https://raw.githubusercontent.com/oznu/homebridge-syno-spk/master/PACKAGE_ICON.PNG', - 'https://raw.githubusercontent.com/oznu/homebridge-syno-spk/master/PACKAGE_ICON_256.PNG' + 'https://raw.githubusercontent.com/homebridge/homebridge-syno-spk/master/PACKAGE_ICON.PNG', + 'https://raw.githubusercontent.com/homebridge/homebridge-syno-spk/master/PACKAGE_ICON_256.PNG' ], snapshot: [], qinst: true, @@ -50,8 +50,8 @@ const path = require('path'); deppkgs: null, conflictpkgs: null, start: true, - maintainer: 'oznu', - maintainer_url: 'https://github.com/oznu/homebridge-syno-spk', + maintainer: 'homebridge', + maintainer_url: 'https://github.com/homebridge/homebridge-syno-spk', distributor: '', distributor_url: '', support_url: '', diff --git a/ui/config b/ui/config index 40732fb..e720aeb 100644 --- a/ui/config +++ b/ui/config @@ -1,6 +1,6 @@ { ".url": { - "oznu.homebridge": { + "homebridge.homebridge": { "title": "Homebridge", "desc": "Homebridge UI", "icon": "images/icon_256.png", From d862292a0c6a7df0df163258f7504f9bf25ea496 Mon Sep 17 00:00:00 2001 From: Northern Man <19808920+NorthernMan54@users.noreply.github.com> Date: Sat, 1 Jul 2023 09:22:46 -0400 Subject: [PATCH 2/6] Update main.yml --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f27b55e..3cc8696 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,12 @@ on: description: 'Version / Tag (x.x.x):' required: true +permissions: + id-token: write + contents: read + issues: write + pull-requests: write + jobs: release: name: Create Release From 2ff0465c712307989cb33554de6e3b4437de0154 Mon Sep 17 00:00:00 2001 From: Northern Man <19808920+NorthernMan54@users.noreply.github.com> Date: Sat, 1 Jul 2023 09:25:32 -0400 Subject: [PATCH 3/6] Update main.yml --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3cc8696..f27b55e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,12 +7,6 @@ on: description: 'Version / Tag (x.x.x):' required: true -permissions: - id-token: write - contents: read - issues: write - pull-requests: write - jobs: release: name: Create Release From d72e800b2d1cc918231d842b6cb2daf8ed45615e Mon Sep 17 00:00:00 2001 From: Northern Man <19808920+NorthernMan54@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:16:26 -0400 Subject: [PATCH 4/6] 32 Bit no longer supported on Linux x86 is no longer available, only x64 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f27b55e..844faf0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,7 +93,7 @@ jobs: NODE_ARCH: x64 - SPK_PLATFORM: evansport SPK_ARCH: i686 - NODE_ARCH: x86 + NODE_ARCH: x64 - SPK_PLATFORM: rtd1296 SPK_ARCH: armv8 NODE_ARCH: arm64 From 4f84c0adf1e164818dc4f444a07d57b3457552c8 Mon Sep 17 00:00:00 2001 From: Northern Man <19808920+NorthernMan54@users.noreply.github.com> Date: Mon, 17 Jul 2023 09:36:48 -0400 Subject: [PATCH 5/6] Update main.yml --- .github/workflows/main.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 844faf0..a976989 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -171,6 +171,17 @@ jobs: cd repo node index.js + - name: Upload synology-spk-repo.json + id: uploadsynology-spk-repo-json + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: repo/spks/synology-spk-repo.json + asset_name: synology-spk-repo.json + asset_content_type: application/json + - name: Upload Repo JSON to S3 run: | cat repo/spks/synology-spk-repo.json | jq From efb4d8c3b5a094681c5f6a6ec619e507a404dcb2 Mon Sep 17 00:00:00 2001 From: Northern Man <19808920+NorthernMan54@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:11:35 -0400 Subject: [PATCH 6/6] Update main.yml --- .github/workflows/main.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a976989..c12eb27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -172,15 +172,12 @@ jobs: node index.js - name: Upload synology-spk-repo.json - id: uploadsynology-spk-repo-json - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + id: upload-synology-spk-repo-json + uses: AButler/upload-release-assets@v2.0 with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: repo/spks/synology-spk-repo.json - asset_name: synology-spk-repo.json - asset_content_type: application/json + files: repo/spks/synology-spk-repo.json + repo-token: ${{ secrets.GITHUB_TOKEN }} + release-tag: ${{ github.event.inputs.version }} - name: Upload Repo JSON to S3 run: |