Skip to content

Commit 09e4b6d

Browse files
committed
Updated to jdk13 and other minor updates.
1 parent 4ff55e6 commit 09e4b6d

File tree

5 files changed

+40
-41
lines changed

5 files changed

+40
-41
lines changed

.circleci/config.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ version: 2.1
1313
orbs:
1414
build-tools: circleci/build-tools@2.6.3
1515
jq: circleci/jq@1.9.0
16-
docker: circleci/docker@0.5.3 # needs jq above
17-
node: circleci/node@1.1.2
16+
docker: circleci/docker@0.5.13 # needs jq above
17+
node: circleci/node@1.1.6
1818

1919
jobs:
2020
download_from_code_climate:
@@ -23,7 +23,7 @@ jobs:
2323
working_directory: ~/repo
2424
steps:
2525
- run:
26-
name: Download cc-test-reporter
26+
name: Download cc-test-reporter
2727
command: |
2828
mkdir -p tmp/
2929
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
@@ -33,14 +33,14 @@ jobs:
3333
root: tmp
3434
paths:
3535
- cc-test-reporter
36-
36+
3737
build_test_java:
3838
<<: *defaults
3939
docker:
4040
# specify the version you desire here
4141
# https://circleci.com/docs/2.0/docker-image-tags.json
4242
# circleci/openjdk:11-jdk-node-browsers
43-
- image: adoptopenjdk:12.0.1_12-jdk-hotspot
43+
- image: adoptopenjdk/openjdk13
4444
environment:
4545
CC_TEST_REPORTER_ID: $CC_TEST_REPORTER_ID
4646
COVERALLS_REPO_TOKEN: $COVERALLS_REPO_TOKEN
@@ -53,7 +53,7 @@ jobs:
5353
# Customize the JVM maximum heap limit
5454
JVM_OPTS: -Xmx3200m
5555
TERM: dumb
56-
56+
5757
steps:
5858
- checkout
5959
- build-tools/install-ci-tools
@@ -67,36 +67,36 @@ jobs:
6767
# Download and cache dependencies
6868
- restore_cache:
6969
keys:
70-
- v1-dependencies-{{ checksum "build.gradle" }}
71-
# fallback to using the latest cache if no exact match is found
72-
- v1-dependencies-
70+
- v1-dependencies-{{ checksum "build.gradle" }}
71+
# fallback to using the latest cache if no exact match is found
72+
- v1-dependencies-
7373

7474
- run: bash ./gradlew dependencies
7575

7676
- save_cache:
7777
paths:
7878
- ~/.gradle
7979
key: v1-dependencies-{{ checksum "build.gradle" }}
80-
80+
8181
# run tests!
8282
- run: bash ./gradlew test jacocoJupTestReport
8383

8484
#upload test coverage to codecov
8585
- run: bash <(curl -s https://codecov.io/bash) #-cF java
8686

87-
# run test coverage to code climate // https://github.com/codeclimate/test-reporter/issues/243
88-
- run:
87+
# run test coverage to code climate // https://github.com/codeclimate/test-reporter/issues/243
88+
- run:
8989
name: Run CodeClimate
9090
command: |
9191
cd ./src/
9292
../tmp/cc-test-reporter format-coverage --add-prefix src/ --prefix /home/circleci/repo/src -t jacoco ../build/reports/jacoco/report.xml -o ../tmp/codeclimate.java.json
9393
- persist_to_workspace:
9494
root: tmp
95-
paths:
95+
paths:
9696
- codeclimate.java.json
97-
98-
# run test coverage to coveralls
99-
- run:
97+
98+
# run test coverage to coveralls
99+
- run:
100100
name: Upload to coveralls
101101
command: |
102102
bash ./gradlew test jacocoJupTestReport coveralls
@@ -109,9 +109,9 @@ jobs:
109109
curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
110110
fossa init
111111
fossa analyze
112-
112+
113113
# upload test coverage to codacy
114-
# - run:
114+
# - run:
115115
# command: |
116116
# wget -O codacy-coverage-reporter-assembly.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/2.0.2/codacy-coverage-reporter-2.0.2-assembly.jar
117117
# java -cp codacy-coverage-reporter-assembly.jar com.codacy.CodacyCoverageReporter -l Java -r build/reports/jacoco/report.xml
@@ -120,15 +120,15 @@ jobs:
120120

121121
build_test_python:
122122
<<: *defaults
123-
docker:
124-
- image: circleci/python:3.7.2
123+
docker:
124+
- image: circleci/python:3.7.4
125125
environment:
126126
CC_TEST_REPORTER_ID: $CC_TEST_REPORTER_ID
127127
COVERALLS_REPO_TOKEN: $COVERALLS_REPO_TOKEN
128128
CODACY_PROJECT_TOKEN: $CODACY_PROJECT_TOKEN
129129

130130
working_directory: ~/repo
131-
131+
132132
steps:
133133
- checkout
134134

@@ -148,16 +148,16 @@ jobs:
148148
- run: bash <(curl -s https://codecov.io/bash) #-cF python
149149

150150
# run test coverage to code climate
151-
- run:
151+
- run:
152152
name: Run CodeClimate
153153
command: |
154154
tmp/cc-test-reporter format-coverage --prefix /home/circleci/repo -t coverage.py coverage.xml -o tmp/codeclimate.python.json
155155
- persist_to_workspace:
156156
root: tmp
157-
paths:
157+
paths:
158158
- codeclimate.python.json
159-
160-
# run test coverage to coveralls
159+
160+
# run test coverage to coveralls
161161
- run:
162162
name: Upload to coveralls
163163
command: |
@@ -173,8 +173,8 @@ jobs:
173173

174174
upload_to_code_climate:
175175
<<: *defaults
176-
docker:
177-
- image: circleci/python:3.7.2
176+
docker:
177+
- image: circleci/python:3.7.4
178178
environment:
179179
CC_TEST_REPORTER_ID: $CC_TEST_REPORTER_ID
180180
working_directory: ~/repo
@@ -202,18 +202,18 @@ workflows:
202202
- master
203203
requires:
204204
- download_from_code_climate
205-
- build_test_python:
205+
- build_test_python:
206206
filters:
207207
branches:
208208
only:
209209
- master
210210
requires:
211211
- download_from_code_climate
212-
- upload_to_code_climate:
212+
- upload_to_code_climate:
213213
filters:
214214
branches:
215215
only:
216216
- master
217217
requires:
218218
- build_test_java
219-
- build_test_python
219+
- build_test_python

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- uses: actions/checkout@v1
99
- uses: actions/setup-java@v1
1010
with:
11-
java-version: "12.0.1"
11+
java-version: "13.0.3"
1212
architecture: x64
1313
- run: java -version
1414
- name: Make javacode

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dist: xenial
33
language: java
44

55
jdk:
6-
- openjdk12
6+
- openjdk13
77

88
branches:
99
only:
@@ -19,7 +19,7 @@ script:
1919
- bash ./gradlew test jacocoJupTestReport
2020
- python3.7 --version
2121
- pyenv versions
22-
- pyenv global 3.7.1
22+
- pyenv global 3.7.4
2323
- pip install --upgrade pip
2424
- pip install -r requirements.txt
2525
- coverage3 run scripts/run_unit_tests.py

appveyor.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ version: 1.0.{build}
22

33
branches:
44
except:
5-
- gh-pages
5+
- gh-pages
66

77
skip_tags: true
88

99
image:
10-
- Visual Studio 2017
11-
- Ubuntu
10+
- Visual Studio 2019
11+
- Ubuntu
1212

13-
# todo: https://github.com/appveyor/ci/issues/2160
14-
stack: node 9, jdk 12, python 3.7.1 x64
13+
stack: node Current, jdk 13, python 3.7.4 x64
1514

1615
install:
1716
- cmd: "SET JAVA_HOME=C:\\Program Files\\Java\\jdk12"
@@ -22,7 +21,7 @@ install:
2221
- cmd: python --version"
2322
- cmd: python -m pip install -r requirements.txt
2423
- sh: whereis python3.7
25-
- sh: . /home/appveyor/venv3.7.1/bin/activate
24+
- sh: . /home/appveyor/venv3.7.4/bin/activate
2625
- sh: python --version
2726
- sh: pip install -r requirements.txt
2827

@@ -38,4 +37,4 @@ test_script:
3837

3938
after_test:
4039
- cmd: python scripts\\create_problems_list.py
41-
- sh: python3.7 scripts/create_problems_list.py
40+
- sh: python3.7 scripts/create_problems_list.py
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)