Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to merge develop into branch #278

Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/DeployExtension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
working-directory: ./vs code extension
environment: production
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: 16
- run: npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/VSCodeBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
working-directory: ./vs code extension
environment: production
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v2
with:
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/VerifyAction.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
name: VerifyAction

on:
push:
branches:
- '*'
pull_request:
branches: [ main ]
branches: [ main,Developer ]

jobs:
build:
Expand All @@ -17,9 +14,9 @@ jobs:
java-version: [8, 11]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
distribution: 'adopt'
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,8 @@ nb-configuration.xml
## OS X
##############################
.DS_Store
output/testResults.txt
approval-test-actual.txt
default.conf
null
ParserErrorLog.txt
331 changes: 0 additions & 331 deletions ALLTESTS

This file was deleted.

Loading
Loading