Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2210 commits
Select commit Hold shift + click to select a range
faa9633
fix: upgrade mysql:mysql-connector-java from 8.0.16 to 8.0.21
snyk-bot Aug 27, 2020
d2fd941
fix: upgrade org.apache.commons:commons-lang3 from 3.7 to 3.11
snyk-bot Aug 27, 2020
623010d
#67 increasing dependency versions, license checking failing, WIP
mosefer Aug 28, 2020
53cb456
#67 updating licenses
mosefer Aug 31, 2020
223b3a5
#67 api changes due to dependency bumps
mosefer Aug 31, 2020
d649960
Merge branch 'master' into ticket#67/dependency_bumps
mosefer Aug 31, 2020
1bc3b34
Merge pull request #68 from NationalSecurityAgency/ticket#67/dependen…
rmmayo Aug 31, 2020
bcd6ecf
#70 - up'ed spring boot version to 2.3.0 to address bug introduced in…
Sep 1, 2020
c497608
#70 - up'ed spring boot version to 2.3.3 to address bug introduced in…
Sep 1, 2020
2e52146
Merge pull request #71 from NationalSecurityAgency/ticket#70/upgrade_…
sudo-may Sep 1, 2020
dd7f236
Merge pull request #11 from TheFoxAtWork/snyk-upgrade-c5eaef2e5499c43…
TheFoxAtWork Sep 2, 2020
403b257
#39: fixed cursor; SecurityConfiguration.groovy - looks like syntax w…
Sep 2, 2020
7a2dc3e
#73: upgraded openjdk to 14.0.2
Sep 2, 2020
46e6e66
#75: use the latest skills vue lib
Sep 2, 2020
695b678
creating_release_version_1.2.0
Sep 2, 2020
5ad9629
prep_master_for_the_next_dev_version_[1.3.0-SNAPSHOT]
Sep 2, 2020
633ef92
fix: upgrade org.codehaus.groovy:groovy-dateutil from 2.5.9 to 2.5.13
snyk-bot Sep 3, 2020
edcc0e8
fix: dashboard/package.json to reduce vulnerabilities
snyk-bot Sep 3, 2020
297c9a7
Merge pull request #13 from TheFoxAtWork/snyk-upgrade-7b593905f99c01a…
TheFoxAtWork Sep 3, 2020
2f09887
Merge pull request #12 from TheFoxAtWork/snyk-upgrade-2a2b3dba1803432…
TheFoxAtWork Sep 3, 2020
611bfbb
Merge pull request #14 from TheFoxAtWork/snyk-upgrade-583c81c9dbf716c…
TheFoxAtWork Sep 3, 2020
be99698
Merge pull request #15 from TheFoxAtWork/snyk-upgrade-a405335644eb5b1…
TheFoxAtWork Sep 3, 2020
e91e375
Merge pull request #16 from TheFoxAtWork/snyk-upgrade-456db236f4a636a…
TheFoxAtWork Sep 3, 2020
d2790da
Merge pull request #17 from TheFoxAtWork/snyk-fix-24e3f8c4e6e8e8899c5…
TheFoxAtWork Sep 3, 2020
b44ea1f
Merge branch 'master' of github:TheFoxAtWork/skills-service
Sep 3, 2020
ab0e3b7
Merge pull request #76
sudo-may Sep 4, 2020
7bd31f2
Bump dompurify from 2.0.3 to 2.0.15 in /client-display
dependabot[bot] Sep 4, 2020
49ec687
Bump node-sass from 4.12.0 to 4.14.1 in /dashboard
dependabot[bot] Sep 4, 2020
e72b5e0
Merge pull request #81
rmmayo Sep 4, 2020
873fea0
Merge pull request #80 from NationalSecurityAgency/dependabot/npm_and…
sudo-may Sep 4, 2020
68ac8a6
Merge pull request #79 from NationalSecurityAgency/dependabot/npm_and…
sudo-may Sep 4, 2020
d0dc68e
Merge pull request #82
rmmayo Sep 4, 2020
191939b
#84: do not add timestamp for a versioned release
Sep 4, 2020
766a57b
Merge pull request #85
rmmayo Sep 4, 2020
f4f164f
#86: Security Patch based on Dependabot warnings
Sep 4, 2020
9f09f96
Merge branch 't#86/version-bump'
Sep 5, 2020
ca1d27e
#69 handle websocket notification of global achievements
mosefer Sep 8, 2020
c050e4e
#69 addressing code review comments
mosefer Sep 10, 2020
35e960a
#69 addressing code review comments
mosefer Sep 10, 2020
31cf8f1
#90: upgraded skills-display runtime and dev npm dependencies; code u…
Sep 10, 2020
3d490df
#90: upgraded dashboard runtime and dev npm dependencies; code update…
Sep 10, 2020
6289918
Merge pull request #91 from NationalSecurityAgency/ticket#69/pending_…
sudo-may Sep 10, 2020
4e71578
#90: updated snapshots; apex charts yaxis colors are configured diffe…
Sep 10, 2020
604dd77
#90: upgraded e2e tests; upgraded node
Sep 10, 2020
022cb6a
#90: removed console statements
Sep 10, 2020
1634e64
#90: disabled eslint for SectionHelper.js, this file will be OBE by m…
Sep 10, 2020
50e6fa8
#90: fixed login spec
Sep 10, 2020
ce8804b
#99 - adding backend support for skills-client lib logging. - WIP
Sep 10, 2020
3705da8
#37 - added hello world angular example tp the quick start section.
Sep 10, 2020
71d3965
#90: snapshots were not committed
Sep 10, 2020
9999331
#90: fixing upload custom icon test
Sep 11, 2020
ae624c7
#90: removed a space to force CI to run
Sep 11, 2020
a199f6e
#90: removed snapshot approach from the new subject's test
Sep 11, 2020
e6ea19a
#100 fix dates and skill definition used in test to eliminate possibi…
mosefer Sep 11, 2020
08683b4
#90: switched to @babel/core; minor version upgrade
Sep 11, 2020
027f830
Merge pull request #102 from NationalSecurityAgency/t#90/npm-dep-upgrade
mosefer Sep 11, 2020
c2a2501
Merge pull request #101
sudo-may Sep 11, 2020
a215710
#95: record cypress tests; temporarily skip maven tests
Sep 14, 2020
98263ee
#95: record cypress tests; temporarily skip maven tests
Sep 14, 2020
17236f9
#95: let's try running cypress tests in parallel
Sep 15, 2020
1e65cd4
#95: let's try running cypress tests in parallel
Sep 15, 2020
aaff192
#95: let's try running cypress tests in parallel
Sep 15, 2020
57990cb
#95: let's try running cypress tests in parallel
Sep 15, 2020
da3bdcb
#95: let's try running cypress tests in parallel
Sep 15, 2020
9d9427b
#44 - removed unused UIConfigProperties
Sep 16, 2020
cbce85c
Merge pull request #104
rmmayo Sep 16, 2020
39bb972
#44 - Wrapping ui client config properties within "clientLib" struct …
Sep 16, 2020
4e1f479
Merge pull request #105
sudo-may Sep 16, 2020
dbcd519
#89 upgraded groovy to 3.0.4, upgraded various other dependencies
mosefer Sep 10, 2020
d9a2c2d
#89 upgrading groovy to 3.0.5
mosefer Sep 14, 2020
a20dea8
Merge branch 'ticket#89/upgrade_maven_dependencies'
Sep 21, 2020
a1e1936
#106: correct that so that the achievement is awarded on the date of …
Sep 21, 2020
2bbc37b
#106: correct that so that the achievement is awarded on the date of …
Sep 22, 2020
c18280e
#106: integration tests
Sep 22, 2020
02f0ab3
#107 fixing bug that prevents startup in pki auth mode
mosefer Sep 22, 2020
798d8c9
#106: added backend retrieval of achieved date for individual skill a…
Sep 22, 2020
dc7801f
#106: Forgot header
Sep 22, 2020
6ff9a7b
#106: fixed where tests were not running for different screen sizes; …
Sep 23, 2020
b3e8bf3
#83 - added github workflow to run e2e tests w/ rabbitmq config
Sep 24, 2020
7f8f34a
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
a905800
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
cff5562
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
95b8a79
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
36bc2a9
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
9bd77a7
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
1dcce19
#83 - added skills-stomp-broker docker file to skills-service
Sep 24, 2020
8e39e72
#94 adding backend support to allow root users to search against all …
mosefer Sep 22, 2020
ffd2244
#94 adding project filter box for root users - WIP
mosefer Sep 24, 2020
fe4ab3b
#94 added pin/unpin capability to UI, improved search box, allow ROLE…
mosefer Sep 24, 2020
80ebe92
#106: enhanced client display point history endpoints to return achie…
Sep 24, 2020
8de1ab8
#106: enhanced client display point history endpoints to return achie…
Sep 24, 2020
0489047
#106: increased wait for animation time
Sep 25, 2020
f5f9cdc
#106: CI
Sep 25, 2020
e4708f8
#94 removing console logging statements
mosefer Sep 25, 2020
7fdeba0
#111 Bump skills-client-vue from 3.0.0 to 3.0.1
mosefer Sep 25, 2020
16947ee
#106: force timezone when formatting dates
Sep 25, 2020
a624bca
#106: added unit tests
Sep 25, 2020
a84618c
#106: removed snapshots temporarily to understand why they are differ…
Sep 25, 2020
2661544
#94 add integration tests
mosefer Sep 25, 2020
7b06b99
#106: got timezones explicitly specified
Sep 25, 2020
75c624f
Merge pull request #109
sudo-may Sep 25, 2020
a70298c
#94 adding e2e test
mosefer Sep 25, 2020
4afbac4
#103: record cypress runs for nightly CI runs
Sep 25, 2020
e706ad7
#94 removed .only
mosefer Sep 25, 2020
efec7e0
#83 - changed to run on schedule on master.
Sep 25, 2020
604da9b
#103: record cypress runs for nightly CI runs
Sep 25, 2020
c1b99aa
#106: removed dead code per code review
Sep 25, 2020
a6ec471
Merge pull request #112 from NationalSecurityAgency/t#106/achievement…
mosefer Sep 25, 2020
204610a
#94 fix security role
mosefer Sep 25, 2020
f9209a4
#94 fixing specs that relied on previous project loading behavior for…
mosefer Sep 25, 2020
096af67
#103: record cypress runs for nightly CI runs
Sep 25, 2020
d3232e7
#114: Configure test retries
Sep 25, 2020
ad86944
Merge pull request #113
rmmayo Sep 25, 2020
2472027
Merge pull request #115
rmmayo Sep 25, 2020
c3035a3
#94 npm build doesn't like .vue extension
mosefer Sep 28, 2020
b52b041
Merge pull request #116
rmmayo Sep 28, 2020
a63bcef
#83 - changed to run on push on master to test new docker image, the …
Sep 28, 2020
87ca9d5
#83 - changed to run on schedule on master.
Sep 28, 2020
e0416fc
#106 - updated badge summaries to use the acheivedOn date vs createdDate
Sep 28, 2020
e6454c7
#117 - add support for 3rd party oauth - WIP
Oct 2, 2020
bfbbd04
#117 - add support for 3rd party oauth - WIP
Oct 2, 2020
a4c9e35
#110 vue-virtual-scroll-list update introduced new api, refactor Icon…
mosefer Oct 2, 2020
c84bb1d
#110 added e2e tests
mosefer Oct 2, 2020
c774078
#110 picky license header format
mosefer Oct 2, 2020
a1e5dfd
#110 make icon selection tests less prone to failure
mosefer Oct 4, 2020
be500f5
#110 further attempts to molify ci-cypress
mosefer Oct 5, 2020
b563268
#110 removing .only from tests
mosefer Oct 5, 2020
8bfc602
#110 fixing call to virtual-scroll-list.reset() for font awesome tab
mosefer Oct 5, 2020
45900b0
#110 more appeasing cypress
mosefer Oct 5, 2020
a17fffa
Merge pull request #118
sudo-may Oct 5, 2020
3204cd9
#96 updated vee-validate version, changed form behavior, removed over…
mosefer Sep 30, 2020
0bbd72f
#96 fix e2e tests that used data-vv-name attribute, migrated to using…
mosefer Oct 1, 2020
210363c
#96 formatting
mosefer Oct 1, 2020
7adb66a
#96 updated tests that broke due to vee-validate upgrade, changed for…
mosefer Oct 2, 2020
210843f
#96 resolve npm build error
mosefer Oct 5, 2020
e929bdf
#57 - add support for 3rd party oauth - WIP
Oct 5, 2020
5888775
#96 fixing e2e tests
mosefer Oct 6, 2020
27c322f
#96 adding more e2e tests for EditSkill to exercise validators, fixin…
mosefer Oct 7, 2020
7a34c2c
#96 remove .only from skills_spec
mosefer Oct 7, 2020
2de6272
#96 validation e2e tests for levels
mosefer Oct 7, 2020
e3922ae
#96 removing .only from spec
mosefer Oct 7, 2020
20a2b19
#96 fixed skills_spec
mosefer Oct 8, 2020
413a09a
#96 make validation failure messages more consistent
mosefer Oct 8, 2020
5c437bf
#96 update specs due to changed validation message format
mosefer Oct 8, 2020
edeb327
#96 update specs due to changed validation message format
mosefer Oct 8, 2020
4629cd5
#96 make messages more consistent
mosefer Oct 8, 2020
30f71e2
#96 removing .only from badge spec
mosefer Oct 8, 2020
62628f9
#96 speed up settings spec
mosefer Oct 9, 2020
640a593
#96 enhance execution speed of settings spec
mosefer Oct 9, 2020
25fd76b
#96 removed betterEager validation interaction mode in favor of defau…
mosefer Oct 9, 2020
d7779e0
#96 fixing skill validation spec, removing .only from setting spec
mosefer Oct 9, 2020
3efa3ce
#96 removing commented out custom validation interaction mode
mosefer Oct 9, 2020
3b9c6c0
#117 - add support for 3rd party oauth - WIP
Oct 13, 2020
0066c01
#96 removing commented out test
mosefer Oct 15, 2020
71d5ea8
Merge pull request #119 from NationalSecurityAgency/ticket#96/upgrade…
sudo-may Oct 15, 2020
0ded0ab
Merge pull request #120 from NationalSecurityAgency/T#57_OAuth
rmmayo Oct 15, 2020
2e4ff38
#93 adding int test user certs and basic wiremock config for user-inf…
mosefer Oct 19, 2020
bde076a
#121 sync value on ValidationProvider in IdInput, value can be change…
mosefer Oct 19, 2020
5c4caf2
#121 add test to validate name triggering id validation
mosefer Oct 19, 2020
22159e3
#121 change input method for id field
mosefer Oct 19, 2020
112dbf3
#121 adding some additional e2e tests
mosefer Oct 19, 2020
e8726ec
Merge pull request #122
sudo-may Oct 19, 2020
a23d935
#123: removed cypress artifacts from uploading as we have them availa…
Oct 20, 2020
8b98c98
#124 reduce opportunity for inconsistent failures
mosefer Oct 20, 2020
c573457
#131 change spec behavior to hopefully avoid sporadic failures in cyp…
mosefer Oct 21, 2020
9b0e07e
#57 - added supported oauth provider id's in support of skills-client…
Oct 27, 2020
5f5ef4b
#57 - fix failing tests due to potential NPE
Oct 27, 2020
2040bf4
#93 fixing integration tests, adding test user ssl certs
mosefer Oct 28, 2020
24b70ca
#93 fixing license headers
mosefer Oct 28, 2020
ef975fd
#93 fixing license headers exclude path
mosefer Oct 28, 2020
bd5f820
#93 fixing license headers exclude path
mosefer Oct 28, 2020
de5229c
#135 - utilize spring auto configuration for Redis config
Oct 28, 2020
10dc966
#137 - when using FORM authorization, use a custom CookieSerializer t…
Oct 28, 2020
562ef01
#132 change validation interaciton mode to remove validation on blur,…
mosefer Oct 28, 2020
a1d1e5a
#132 fixing e2e test
mosefer Oct 28, 2020
cbc75f2
Update the language of README, add SkillTree logo
mosefer Oct 29, 2020
a8b331d
Merge pull request #140 from NationalSecurityAgency/update_readme
rmmayo Oct 29, 2020
a0b30c6
#132 fixing level dialog test
mosefer Oct 29, 2020
b66965e
#121 adding spec that wasn't merged from original branch
mosefer Oct 29, 2020
d7d76d3
updating logo in readme
mosefer Oct 29, 2020
c1a0f46
actually have to add the logo
mosefer Oct 29, 2020
7aabf03
removing white text version of logo
mosefer Oct 29, 2020
dc20842
Merge pull request #134
sudo-may Oct 29, 2020
e4412af
Merge pull request #139
sudo-may Oct 29, 2020
df7ff8e
#135 - programmatically disable spring auto configuration for Redis u…
Oct 29, 2020
1e7ef8c
#135 - programmatically disable spring auto configuration for Redis u…
Oct 29, 2020
9b9596f
Revert "#135 - utilize spring auto configuration for Redis config"
Oct 29, 2020
f1eb7d4
Merge pull request #138
sudo-may Oct 29, 2020
df7821a
Merge branch 'master' into T#135/redis_autoconfig
rmmayo Oct 29, 2020
c32e87a
Merge pull request #136 from NationalSecurityAgency/T#135/redis_autoc…
rmmayo Oct 29, 2020
9a9740f
Update README.md
sudo-may Oct 29, 2020
1a6b2a6
#135 - utilize spring auto configuration for Redis config
Oct 29, 2020
92a1461
#142 properly define env variables
mosefer Oct 30, 2020
bd322a0
#125 prevent publishing empty badges
mosefer Oct 29, 2020
4eac851
#125 make sure that global badge saves check for either skills or pro…
mosefer Oct 30, 2020
36b4bc6
#142 temporarily change trigger for ssl workflow
mosefer Oct 30, 2020
a0a4038
#142 fix env properly
mosefer Oct 30, 2020
74b0b81
#142 fix DataMigrationDBIT for pki test runs
mosefer Oct 30, 2020
4e984e3
#141 - set usernameForDisplay to be the oauth provider supplied usern…
Oct 30, 2020
685689c
#133: improve look-and-feel of the dashboard - WIP
Oct 28, 2020
d8d13da
#144: nightly schedule
Oct 30, 2020
bad16f3
#133: improve look-and-feel of the dashboard - WIP
Oct 29, 2020
8eea4de
#133: improve look-and-feel of the dashboard - WIP
Oct 30, 2020
ff13218
#133: improve look-and-feel of the dashboard - WIP
Oct 30, 2020
0c90a19
#133: improve look-and-feel of the dashboard - WIP
Oct 30, 2020
d53b43e
#133: improve look-and-feel of the dashboard - WIP
Oct 30, 2020
311111b
#133: made the colors consistent; fixed service tests
Oct 30, 2020
82fc7f5
#133: improved color usage
Oct 30, 2020
ee70d51
#133: clean up
Oct 30, 2020
ceed050
#33 - updated resource locations and security config so images would …
Nov 2, 2020
1a76b0e
#33 - updated resource locations and security config so images would …
Nov 2, 2020
917658f
#145: enhanced pin/unpin component; added tooltips to nav; updated fo…
Nov 2, 2020
ca6f2a8
#145: updated icon for the projects and dependencies; improved cypres…
Nov 2, 2020
6a2d9bc
Merge pull request #144
sudo-may Nov 2, 2020
da94d42
Merge pull request #147 from NationalSecurityAgency/t#145/look-and-fe…
mosefer Nov 3, 2020
aa2b958
Merge pull request #143
sudo-may Nov 4, 2020
c716135
#145: fixing cypress test to disregard order
Nov 4, 2020
06145f1
#95: multiple projects metrics - WIP
Nov 4, 2020
5835490
Merge pull request #149 from NationalSecurityAgency/t#145/look-and-fe…
rmmayo Nov 4, 2020
e292e62
#150 - add support for oauth testing to e2e-tests - WIP
Nov 4, 2020
821dcb2
#150 - add null check
Nov 4, 2020
0384a64
#150 - add support for oauth testing to e2e-tests - WIP
Nov 4, 2020
87a15d1
#150 - add support for oauth testing to e2e-tests - WIP
Nov 4, 2020
e4f1e22
#150 - add support for oauth testing to e2e-tests - WIP
Nov 4, 2020
9e8e9f4
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
b3d41e6
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
0ebc35c
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
ff57797
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
735700c
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
acd925e
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
ffdec00
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
d541829
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
fbe4811
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
4d63a16
#150 - add support for oauth testing to e2e-tests - WIP
Nov 5, 2020
ea01ce1
Merge pull request #151
sudo-may Nov 6, 2020
d3c8de3
#154 - use computed property since we have using v-model. explictly…
Nov 10, 2020
b3f9f54
#158: rewrote tests to use project and subject pages instead
Nov 10, 2020
9956bdd
#155: logo update
Nov 9, 2020
7b214c5
#155: logo update
Nov 10, 2020
12496c9
#146: cypress upgrade
Nov 2, 2020
85d1b11
#146: cypress upgrade
Nov 10, 2020
0b87348
Merge pull request #156
rmmayo Nov 10, 2020
8f23ae0
Merge pull request #148
rmmayo Nov 10, 2020
a8fd16c
#159: skip-duplicate-actions
Nov 10, 2020
4a065d3
#160 - added legal/IP contribution documents
Nov 10, 2020
dc57f0c
Merge pull request #162
rmmayo Nov 10, 2020
825d302
Merge pull request #161
sudo-may Nov 10, 2020
8152fb4
#154 - added cypress test
Nov 10, 2020
fc908a3
Merge pull request #157
sudo-may Nov 11, 2020
8a13d4f
#165 - - added null check when checking for uniqueName in level names…
Nov 11, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
132 changes: 132 additions & 0 deletions .github/workflows/build-and-test-oauth.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Copyright 2020 SkillTree
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Continuous Integration with OAuth

#on:
# push:
# paths-ignore:
# - 'README.md'
# pull_request:
# paths-ignore:
# - 'README.md'
on:
schedule:
- cron: '0 6 * * *'


jobs:
ci:
runs-on: ubuntu-latest

steps:
- name: Install Emoji Support
run: sudo apt-get install fonts-noto-color-emoji

- uses: actions/checkout@v2

- name: Checkout skills-client
uses: actions/checkout@v2
with:
repository: NationalSecurityAgency/skills-client
path: skills-client

- uses: actions/setup-node@v2-beta
with:
node-version: '14'

- name: Set up Maven
uses: stCarolas/setup-maven@v3
with:
maven-version: 3.6.3

- uses: actions/setup-java@v1
with:
java-version: '11.X.X' # The JDK version to make available on the path.

- name: Print Versions
run: |
mvn --version
java -version

- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Build skills-service
run: mvn --batch-mode install -DskipTests

- name: run hyrda oauth service
run: |
cd skills-client/
./.github/workflows/scripts/runHydra.sh
cd ../

- name: Check running containers
run: docker ps -a

- name: Caputre Hydra Oauth Service logs
run: |
mkdir -p ./e2e-tests/logs
docker logs hydra > ./e2e-tests/logs/hydra.out &
docker container logs -f hydra_consent > ./e2e-tests/logs/hydra_consent.out &
docker container logs -f hydra_postgres > ./e2e-tests/logs/hydra_postgres.out &

- name: Register hydra client
run: |
docker-compose -f ./skills-client/skills-client-integration/skills-int-e2e-test/hydra/quickstart.yml exec -T hydra \
hydra clients create \
--endpoint http://localhost:4445/ \
--id skilltree-test \
--secret client-secret \
--grant-types authorization_code,refresh_token \
--response-types code \
--scope openid \
--callbacks http://localhost:8080/login/oauth2/code/hydra

- name: Start services for Cypress tests
run: |
cd e2e-tests
npm install
npm run cyServices:start:skills-service:oauth
npm run cyServices:start:client-display:oauth
cd ..

- name: Run Cypress tests
uses: cypress-io/github-action@v2
with:
working-directory: e2e-tests
record: true
parallel: false
group: 'skills-service with OAuth'
env: oauthMode=true
env:
# pass the Dashboard record key as an environment variable
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# pass GitHub token to allow accurately detecting a build vs a re-run build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: upload result artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: CI result artifacts
path: |
./service/target/*.jar
./service/target/*.log
./e2e-tests/logs
117 changes: 117 additions & 0 deletions .github/workflows/build-and-test-postgres.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
# Copyright 2020 SkillTree
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Test against PostgreSQL

#on:
# push:
# paths-ignore:
# - 'README.md'
# pull_request:
# paths-ignore:
# - 'README.md'
on:
schedule:
- cron: '0 5 * * *'


jobs:
ci:
runs-on: ubuntu-latest

services:
postgres:
# Docker Hub image
image: postgres
# Provide the password for postgres
env:
POSTGRES_PASSWORD: skillsPassword
POSTGRES_DB: skills
# Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
# Maps tcp port 5432 on service container to the host
- 5432:5432

steps:
- name: Install Emoji Support
run: sudo apt-get install fonts-noto-color-emoji

- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
with:
node-version: '14'

- name: Set up Maven
uses: stCarolas/setup-maven@v3
with:
maven-version: 3.6.3

- uses: actions/setup-java@v1
with:
java-version: '11.X.X' # The JDK version to make available on the path.

- name: Print Versions
run: |
mvn --version
java -version

- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Build skills-service
run: mvn --batch-mode install -Dspring.datasource.url=jdbc:postgresql://localhost:5432/skills -Dspring.datasource.username=postgres -Dspring.datasource.password=skillsPassword

- name: Start Services for Cypress tests
run: |
cd e2e-tests
npm install
npm run backend:dropAllDBTables:postgres
npm run cyServices:start:skills-service:postgresql
npm run cyServices:start:client-display
cd ..

- name: Run Cypress tests
uses: cypress-io/github-action@v2
with:
working-directory: e2e-tests
record: true
parallel: false
group: 'skills-service against postgres'
env: db=postgres
env:
# pass the Dashboard record key as an environment variable
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# pass GitHub token to allow accurately detecting a build vs a re-run build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: upload result artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: CI result artifacts
path: |
./service/target/*.jar
./service/target/*.log
./e2e-tests/logs
106 changes: 106 additions & 0 deletions .github/workflows/build-and-test-rabbitmq.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# Copyright 2020 SkillTree
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Test Web Sockets over STOMP using RabbitMQ

#on:
# push:
# paths-ignore:
# - 'README.md'
# pull_request:
# paths-ignore:
# - 'README.md'
on:
schedule:
- cron: '0 6 * * *'


jobs:
ci:
runs-on: ubuntu-latest

services:
rabbitmq:
image: skilltree/skills-stomp-broker:1.0.0
ports:
# Maps port 15672 and 61613 on service container to the host
- 15672:15672
- 61613:61613

steps:
- name: Install Emoji Support
run: sudo apt-get install fonts-noto-color-emoji

- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
with:
node-version: '14'

- name: Set up Maven
uses: stCarolas/setup-maven@v3
with:
maven-version: 3.6.3

- uses: actions/setup-java@v1
with:
java-version: '11.X.X' # The JDK version to make available on the path.

- name: Print Versions
run: |
mvn --version
java -version

- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Build skills-service
run: mvn --batch-mode install -DskipTests

- name: Start services for Cypress tests
run: |
cd e2e-tests
npm install
npm run cyServices:start:skills-service:rabbitmq
npm run cyServices:start:client-display
cd ..

- name: Run Cypress tests
uses: cypress-io/github-action@v2
with:
working-directory: e2e-tests
record: true
parallel: false
group: 'skills-service with STOMP using RabbitMQ'
env:
# pass the Dashboard record key as an environment variable
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# pass GitHub token to allow accurately detecting a build vs a re-run build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


- name: upload result artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: CI result artifacts
path: |
./service/target/*.jar
./service/target/*.log
./e2e-tests/logs
Loading