Skip to content

Commit 5e5aefd

Browse files
authored
Merge pull request #262 from NationalSecurityAgency/t#261/ci_failures
T#261/ci failures
2 parents ad321f0 + 54eca19 commit 5e5aefd

File tree

80 files changed

+111
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+111
-276
lines changed

.github/workflows/scripts/getSkillsService.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020 SkillTree
1+
# Copyright 2025 SkillTree
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/scripts/runCypressTests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020 SkillTree
1+
# Copyright 2025 SkillTree
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/scripts/setupNpmLinks.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@ npm link @skilltree/skills-client-js
3535
cd ../../skills-client-js
3636
echo "------- skills-client-js: npm install -------"
3737
npm install
38+
npm run build
39+
3840
echo "------- skills-int-client-js: npm install -------"
3941
cd ../skills-client-integration/skills-int-client-js/
4042
npm install
4143

4244
echo "------- validate npm links -------"
43-
if ! npm ls --link --global | grep -q "skills-client-js@3.6.1"; then
44-
echo "Error: skills-client-js@3.6.1 is not properly linked"
45+
if ! npm ls --link --global | grep "skills-client-js"; then
46+
echo "Error: skills-client-js is not properly linked"
4547
exit 1
4648
else
47-
echo "Verified: skills-client-js@3.6.1 is properly linked"
49+
echo "Verified: skills-client-js is properly linked"
4850
fi
4951

5052
echo "------- skills-int-client-js: npm run build -------"

skills-client-integration/license-add/LICENSE-HEADER.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2020 SkillTree
1+
Copyright 2025 SkillTree
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

skills-client-integration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>3.4.7</version>
10+
<version>3.5.3</version>
1111
<relativePath/> <!-- lookup parent from repository -->
1212
</parent>
1313
<groupId>skills</groupId>

skills-client-integration/skills-int-client-js/app/clientDisplay.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2020 SkillTree
2+
Copyright 2025 SkillTree
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

skills-client-integration/skills-int-client-js/app/clientDisplayDefaultOptions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2020 SkillTree
2+
Copyright 2025 SkillTree
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

skills-client-integration/skills-int-client-js/app/disabledConfig.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2020 SkillTree
2+
Copyright 2025 SkillTree
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

skills-client-integration/skills-int-client-js/app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2020 SkillTree
2+
Copyright 2025 SkillTree
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

skills-client-integration/skills-int-client-js/copyDeps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 SkillTree
2+
* Copyright 2025 SkillTree
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)