Skip to content

Commit 593a5c5

Browse files
Vinay Shankar Shuklasriv
Vinay Shankar Shukla
andauthored
Fix launcher (getgauge#459)
* Migrate sh/pwsh lauchers to golang getgauge#455 Signed-off-by: BugDiver <[email protected]> * Add version comparison for pluin and dependency (via build files). Signed-off-by: BugDiver <[email protected]> * Downgrade grpc-protobuf version. Signed-off-by: BugDiver <[email protected]> * log output of java process change implementation to look up gauge-java version Signed-off-by: sriv <[email protected]> * set enable_multithreading explicitly Signed-off-by: sriv <[email protected]> * fix checkstyle Signed-off-by: sriv <[email protected]> * use concurrentmap for ExecutorPool fix read multithreading/streamsCount env Signed-off-by: sriv <[email protected]> * log time taken for startup Signed-off-by: sriv <[email protected]> * add toggle to scan external dependencies Signed-off-by: sriv <[email protected]> * scan jars in a separate thread Signed-off-by: sriv <[email protected]> Co-authored-by: sriv <[email protected]>
1 parent c25c34b commit 593a5c5

19 files changed

+1013
-675
lines changed

Diff for: .github/workflows/release_on_pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Deploy on github
4545
run: |
46-
cd artifacts
46+
cd deploy
4747
if [ -z "$version" ]; then
4848
version=$(ls gauge-java* | head -1 | sed "s/\.[^\.]*$//" | sed "s/gauge-java-//" | sed "s/-[a-z]*\.[a-z0-9_]*$//")
4949
fi

Diff for: .github/workflows/tests.yml

+34-20
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest, windows-latest]
17-
java_version: [ '11', '12' ]
17+
java_version: ['11', '12']
1818
steps:
19-
2019
- uses: actions/checkout@v2
2120

2221
- name: Setup java
@@ -35,10 +34,9 @@ jobs:
3534
needs: test
3635
strategy:
3736
matrix:
38-
os: [windows-latest, ubuntu-latest ]
37+
os: [windows-latest, ubuntu-latest]
3938

4039
steps:
41-
4240
- uses: actions/checkout@v2
4341

4442
- name: Setup java
@@ -58,15 +56,9 @@ jobs:
5856
go run build/make.go --install
5957
6058
- name: Install Gauge Java plugin from source
61-
if: matrix.os != 'windows-latest'
6259
run: |
63-
./build.sh forceinstall
64-
shell: bash
65-
66-
- name: Install Gauge Java plugin from source
67-
if: matrix.os == 'windows-latest'
68-
run: |
69-
./build.ps1 forceinstall
60+
go run build/make.go
61+
go run build/make.go --install
7062
7163
- name: Install Gauge Java maven package locally
7264
run: |
@@ -82,6 +74,11 @@ jobs:
8274
./gradlew clean javaFT
8375
shell: bash
8476

77+
- name: Log
78+
if: failure()
79+
run: |
80+
cat logs/gauge.log
81+
8582
- uses: actions/upload-artifact@v1
8683
if: failure()
8784
with:
@@ -114,14 +111,9 @@ jobs:
114111
gauge-version: master
115112

116113
- name: Install Gauge Java plugin from source
117-
if: matrix.os != 'windows-latest'
118114
run: |
119-
./build.sh forceinstall
120-
121-
- name: Install Gauge Java plugin from source
122-
if: matrix.os == 'windows-latest'
123-
run: |
124-
./build.ps1 forceinstall
115+
go run build/make.go
116+
go run build/make.go --install
125117
126118
- name: Use Node.js
127119
uses: actions/setup-node@v1
@@ -151,9 +143,31 @@ jobs:
151143
run: |
152144
cd gauge-lsp-tests
153145
gauge run --tags="!knownIssue & (actions_on_project_load | actions_on_file_edit)" --env=java-wd
154-
155146
- uses: actions/upload-artifact@v1
156147
if: failure()
157148
with:
158149
name: lsp-logs-${{ matrix.os }}-${{ matrix.java_version }}
159150
path: gauge-lsp-tests/logs
151+
152+
build:
153+
name: Build artifacts
154+
runs-on: ubuntu-latest
155+
needs: [functional_tests, lsp-tests]
156+
steps:
157+
- name: Set up Go 1.13
158+
uses: actions/setup-go@v1
159+
with:
160+
go-version: 1.13
161+
id: go
162+
- name: Check out code into the Go module directory
163+
uses: actions/checkout@v2
164+
165+
- name: Build distro for ${{ matrix.os }}
166+
run: go run build/make.go --all-platforms && go run build/make.go --all-platforms --distro
167+
shell: bash
168+
169+
- name: Upload artifacts for ${{ matrix.os }}
170+
uses: actions/upload-artifact@v2
171+
with:
172+
name: gauge-java-artifacts
173+
path: deploy/*

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ tmp
2222
deploy
2323
artifacts
2424
*.iml
25-
build/
25+
26+
bin
2627

2728
.DS_Store
2829
.classpath

Diff for: bin/launcher.cmd

-2
This file was deleted.

Diff for: bin/launcher.ps1

-211
This file was deleted.

0 commit comments

Comments
 (0)