Skip to content

Commit

Permalink
Merge pull request #14 from felixSchober/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
felixSchober authored Nov 10, 2020
2 parents 4fc1d5d + 858875c commit 02d1ffc
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 6 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: eslint
on: [pull_request]
jobs:
eslint:
name: runner / eslint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: eslint
uses: reviewdog/action-eslint@v1
with:
reporter: github-pr-review
eslint_flags: 'src --ext ts'
fail_on_error: true
12 changes: 6 additions & 6 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
run: git fetch --prune --unshallow

- name: install gitversion tool
uses: gittools/actions/gitversion/[email protected]
uses: gittools/actions/gitversion/[email protected].5
with:
versionSpec: '5.1.x'

- name: execute gitversion
id: gitversion # step id used as reference for output values
uses: gittools/actions/gitversion/[email protected]
uses: gittools/actions/gitversion/[email protected].5

- name: print gitversion
run: |
Expand All @@ -37,15 +37,15 @@ jobs:
echo "SemVer: ${{ steps.gitversion.outputs.semVer }}"
- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v2.1.2
with:
node-version: '12.x'

- name: clean install dependencies
run: npm ci

- name: update metadata in package.json
uses: onlyutkarsh/[email protected].1
uses: onlyutkarsh/[email protected].2
with:
files: '${{github.workspace}}/package.json'
patch-syntax: |
Expand All @@ -54,7 +54,7 @@ jobs:
= /description => "Local source control for Power Apps portals code for web files like images or style sheets, web templates and content snippets."
- name: add version in CHANGELOG.md
uses: cschleiden/replace-tokens@v1.0
uses: cschleiden/replace-tokens@v1
with:
files: '${{github.workspace}}/CHANGELOG.md'
env:
Expand All @@ -68,7 +68,7 @@ jobs:
echo "VSIX Path: ${{ env.vsix_path }}"
- name: upload vsix as artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v2.2.0
with:
name: powerapps-portal-local-development-${{steps.gitversion.outputs.semVer}}.vsix
path: ${{github.workspace}}/powerapps-portal-local-development-${{steps.gitversion.outputs.semVer}}.vsix
Expand Down
Binary file modified readme/01_intro.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified readme/04_feature.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified readme/05_feature.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/configuration/credentialManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import { env } from 'vscode';

const keytar = getNodeModule<typeof keytarType>('keytar');

// eslint-disable-next-line @typescript-eslint/naming-convention
declare const __webpack_require__: typeof require;
// eslint-disable-next-line @typescript-eslint/naming-convention
declare const __non_webpack_require__: typeof require;

function getNodeModule<T>(moduleName: string): T | undefined {
Expand Down
1 change: 1 addition & 0 deletions src/models/interfaces/d365PublishingState.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/naming-convention */
export interface ID365PublishingState {
adx_publishingstateid: string;
}
1 change: 1 addition & 0 deletions src/models/interfaces/d365WebFile.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/naming-convention */
export interface ID365WebFile {
adx_webfileid: string | undefined;
adx_name: string;
Expand Down
1 change: 1 addition & 0 deletions src/models/interfaces/d365Website.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/naming-convention */
export interface ID365Website {
adx_websiteid: string;
adx_name: string;
Expand Down

0 comments on commit 02d1ffc

Please sign in to comment.