Compare commits

..

No commits in common. "master" and "1.1.1" have entirely different histories.

5 changed files with 79 additions and 95 deletions

71
.drone.yml Normal file
View File

@ -0,0 +1,71 @@
kind: pipeline
type: docker
name: default
steps:
- name: build
image: node
commands:
- npm install
- npm run build
- name: version
image: node
commands:
- export version=`node -p "require('./package.json').version"`
- export commit=`echo $DRONE_COMMIT | cut -c1-5`
- npm version prerelease --preid=$commit --git-tag-version=false --allow-same-version=true
when:
event:
exclude:
- tag
- pull_request
branch:
include:
- master
- name: publish pre
image: plugins/npm
settings:
username:
from_secret: npm_username
password:
from_secret: npm_password
email: b.watson@watsonlabs.net
registry: "http://10.44.1.6:4873/"
when:
event:
exclude:
- tag
- pull_request
branch:
include:
- master
- name: publish tagged version
image: plugins/npm
settings:
username:
from_secret: npm_username
password:
from_secret: npm_password
email: b.watson@watsonlabs.net
registry: "http://10.44.1.6:4873/"
when:
event:
- tag
exclude:
- pull_request
- name: Notify
image: drillster/drone-email
settings:
host: 10.44.1.13
username: srvGitea
password:
from_secret: smtp_password
from: drone@watsonlabs.net
skip_verify: true
when:
status:
- failure

View File

@ -1,81 +0,0 @@
name: Build homebridge-hue-chase
on:
workflow_dispatch:
push:
branches:
- master
jobs:
build:
name: Build
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- run: |
npm ci
npm run build
version:
name: Version
outputs:
version: ${{ steps.get_version.outputs.version }}
commit: ${{ steps.get_version.outputs.commit }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- id: get_version
name: Set Version
run: |
export version=`node -p "require('./package.json').version"`
export commit=`echo $GITHUB_SHA | cut -c1-5`
echo "version=$version" >> "$GITHUB_OUTPUT"
echo "commit=$commit" >> "$GITHUB_OUTPUT"
publish_tagged:
name: Publish Latest
needs:
- build
- version
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: npm config set @watsonb8:registry https://gitea.watsonlabs.net/api/packages/watsonb8/npm/
- name: Publish
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
COMMIT: ${{ needs.version.outputs.commit }}
run: |
npm config set -- '//gitea.watsonlabs.net/api/packages/watsonb8/npm/:_authToken' "$NPM_TOKEN"
npm version prerelease --preid="$COMMIT" --git-tag-version=false --allow-same-version=true
npm publish
deploy:
runs-on:
- ubuntu-latest
- internal
name: Deploy
needs: publish_tagged
steps:
- name: Set up SSH key
run: |
mkdir -p ~/.ssh
echo "${{ secrets.ELEVATED_HOMEBRIDGE_SSH_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan -p 22 homebridge.me >> ~/.ssh/known_hosts
sudo apt update
sudo apt install sshpass
- name: Remove old Package
run: |
sshpass -p '${{ secrets.ELEVATED_HOMEBRIDGE_PASSWORD }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.ELEVATED_HOMEBRIDGE_USER }}@${{ secrets.HOMEBRIDGE_HOST }} <<'ENDSSH'
rm -r /home/${{ secrets.HOMEBRIDGE_USER }}/.npm-global/lib/node_modules/@watsonb8/homebridge-hue-chase
ENDSSH
- name: Deploy
run: |
sshpass -p '${{ secrets.ELEVATED_HOMEBRIDGE_PASSWORD }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.ELEVATED_HOMEBRIDGE_USER }}@${{ secrets.HOMEBRIDGE_HOST }} <<'ENDSSH'
npm install -g @watsonb8/homebridge-hue-chase
ENDSSH

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@watsonb8/homebridge-hue-chase", "name": "@watsonb8/homebridge-hue-chase",
"version": "1.1.3", "version": "1.1.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,10 +1,10 @@
{ {
"name": "@watsonb8/homebridge-hue-chase", "name": "@watsonb8/homebridge-hue-chase",
"version": "1.1.4", "version": "1.1.1",
"description": "A Phillips Hue add on for creating chase sequences.", "description": "A Phillips Hue add on for creating chase sequences.",
"main": "bin/index.js", "main": "bin/index.js",
"publishConfig": { "publishConfig": {
"registry": "https://gitea.watsonlabs.net" "registry": "http://10.44.1.6:4873/"
}, },
"scripts": { "scripts": {
"build": "tsc --build", "build": "tsc --build",

View File

@ -76,14 +76,12 @@ export class Chase implements IAccessory {
.getCharacteristic(Characteristic.On) .getCharacteristic(Characteristic.On)
//@ts-ignore //@ts-ignore
.on("set", this.onPowerSet) .on("set", this.onPowerSet)
//@ts-ignore
.on("get", this.onPowerGet); .on("get", this.onPowerGet);
this._lightbulbService this._lightbulbService
.getCharacteristic(Characteristic.Brightness) .getCharacteristic(Characteristic.Brightness)
//@ts-ignore //@ts-ignore
.on("set", this.onBrightnessSet) .on("set", this.onBrightnessSet)
//@ts-ignore
.on("get", this.onBrightnessGet); .on("get", this.onBrightnessGet);
} }
@ -119,10 +117,8 @@ export class Chase implements IAccessory {
* Handler for switch get event * Handler for switch get event
* @param callback The callback function to call when complete * @param callback The callback function to call when complete
*/ */
private onPowerGet = ( private onPowerGet = () => {
callback: (error: Error | null, value: boolean) => void return this._isActive;
) => {
return callback(null, this._isActive);
}; };
private onBrightnessSet = async ( private onBrightnessSet = async (
@ -138,10 +134,8 @@ export class Chase implements IAccessory {
return callback(); return callback();
}; };
private onBrightnessGet = ( private onBrightnessGet = () => {
callback: (error: Error | null, value: number) => void return this._brightness;
) => {
return callback(null, this._brightness);
}; };
/** /**