Skip to content

Commit

Permalink
Merge pull request #331 from openmainframeproject/Developer
Browse files Browse the repository at this point in the history
Update to version 0.2.8 and new extension version 0.4.2
  • Loading branch information
Rune-Christensen authored Oct 27, 2023
2 parents 5cef4e6 + 2235764 commit 85d78b8
Show file tree
Hide file tree
Showing 165 changed files with 5,350 additions and 3,259 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/DeployExtension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ on:
branches:
- 'main'
paths:
- 'vs code extension/**'
- 'vs-code-extension/**'

name: Deploy Extension
jobs:
deploy:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./vs code extension
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 All @@ -24,4 +24,4 @@ jobs:
with:
pat: ${{ secrets.VS_CODE_EXTENTION_SECRET }}
registryUrl: https://marketplace.visualstudio.com
packagePath: ./vs code extension
packagePath: ./vs-code-extension
4 changes: 2 additions & 2 deletions .github/workflows/VSCodeBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./vs code extension
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
11 changes: 4 additions & 7 deletions .github/workflows/VerifyAction.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
name: VerifyAction

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

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
os: [ubuntu-22.04, windows-latest, macos-latest]
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
25 changes: 15 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LAUNCHTESTT
CC##*

# project specific

testsuites/concatenatedTestsuites
*.hprof
envvars
target/
Expand All @@ -26,14 +26,13 @@ src/test/cobol/TESTPRG.CBL
*.dll
*.exe

#Cobol-check VS CODE extension
vs code extension/**/package-lock.json
vs code extension/**/out
vs code extension/**/node_modules
vs code extension/**/client/server
vs code extension/**/.vscode-test
vs code extension/**/Jenkinsfile

vs-code-extension/**/package-lock.json
vs-code-extension/**/out
vs-code-extension/**/node_modules
vs-code-extension/**/client/server
vs-code-extension/**/.vscode-test
vs-code-extension/**/Jenkinsfile
vs-code-extension/Cobol-check/output/testResults.html

# Java-related gitignore entries from: https://gist.github.com/dedunumax/54e82214715e35439227
##############################
Expand All @@ -42,6 +41,8 @@ vs code extension/**/Jenkinsfile
.mtj.tmp/
*.class
*.jar
# Below is made by ./gradlew prepareDistribution
!vs-code-extension/Cobol-check/bin/*.jar
*.war
*.ear
*.nar
Expand All @@ -66,7 +67,6 @@ buildNumber.properties
## Gradle
##############################
bin/*
!vs code extension/Cobol-check/bin/*
build/*
!build/distributions/
.gradle
Expand Down 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
Loading

0 comments on commit 85d78b8

Please sign in to comment.