Skip to content

Commit

Permalink
update pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
UnchartedBull authored and pciavald committed May 12, 2021
1 parent 9819818 commit b2c5d28
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 3 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/approve-and-merge-dependency-updates.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Automatically approve and merge PRs by dependabot

on:
pull_request:
branches:
- main

jobs:
auto-approve:
name: Auto Approve a PR by dependabot
runs-on: ubuntu-latest
steps:
- name: Auto approve
uses: hmarr/auto-approve-action@v2
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: ${{ secrets.ACTIONS_TOKEN }}
auto-merge:
name: Auto Merge after successful checks
needs: auto-approve
runs-on: ubuntu-latest
steps:
- name: Auto merge
uses: pascalgn/[email protected]
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
MERGE_LABELS: dependencies
MERGE_METHOD: squash
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"start:big": "npm-run-all -p ng:serve electron:serve:big",
"build": "npm run ng:build && electron .",
"test": "",
"lint": "eslint ./src/ -c .eslintrc.js --ext .ts",
"lint": "eslint ./src/ -c .eslintrc.js --ext .ts --max-warnings=0",
"lint:fix": "eslint ./src/ -c .eslintrc.js --ext .ts --fix",
"electron": "electron .",
"electron:dev": "electron . --serve --big",
Expand Down
8 changes: 6 additions & 2 deletions src/app/services/enclosure/enclosure.octoprint.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
EnclosureOutputBody,
EnclosurePluginAPI,
PSUControlCommand,
TPLinkCommand,
TasmotaCommand,
TasmotaMqttCommand,
TPLinkCommand,
} from '../../model/octoprint';
import { NotificationService } from '../../notification/notification.service';
import { EnclosureService } from './enclosure.service';
Expand Down Expand Up @@ -134,7 +134,11 @@ export class EnclosureOctoprintService implements EnclosureService {
};

this.http
.post(this.configService.getApiURL('plugin/tasmota_mqtt'), tasmotaMqttPayload, this.configService.getHTTPHeaders())
.post(
this.configService.getApiURL('plugin/tasmota_mqtt'),
tasmotaMqttPayload,
this.configService.getHTTPHeaders(),
)
.pipe(catchError(error => this.notificationService.setError("Can't send GCode!", error.message)))
.subscribe();
}
Expand Down

0 comments on commit b2c5d28

Please sign in to comment.