Skip to content

Commit e5cc202

Browse files
Merge pull request #40 from Jahia/migrate-gh-packages
chore: migrate to gh packages
1 parent 61cbec2 commit e5cc202

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

.github/workflows/on-code-change.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
needs: update-signature
3535
runs-on: ubuntu-latest
3636
container:
37-
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_8.0.312-node
37+
image: ghcr.io/jahia/jahia-docker-mvn-cache:8-jdk-noble-mvn-loaded
3838
credentials:
39-
username: ${{ secrets.DOCKERHUB_USERNAME }}
40-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
39+
username: ${{ secrets.GH_PACKAGES_USERNAME }}
40+
password: ${{ secrets.GH_PACKAGES_TOKEN }}
4141
steps:
4242
- uses: actions/checkout@v3
4343
- uses: jahia/jahia-modules-action/build@v2

.github/workflows/on-merge.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
needs: update-signature
2828
runs-on: ubuntu-latest
2929
container:
30-
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_8.0.312-node
30+
image: ghcr.io/jahia/jahia-docker-mvn-cache:8-jdk-noble-mvn-loaded
3131
credentials:
32-
username: ${{ secrets.DOCKERHUB_USERNAME }}
33-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
32+
username: ${{ secrets.GH_PACKAGES_USERNAME }}
33+
password: ${{ secrets.GH_PACKAGES_TOKEN }}
3434
steps:
3535
- uses: actions/checkout@v3
3636
- uses: jahia/jahia-modules-action/build@v2
@@ -58,10 +58,10 @@ jobs:
5858
if: github.ref == 'refs/heads/master'
5959
runs-on: ubuntu-latest
6060
container:
61-
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_8.0.312-node
61+
image: ghcr.io/jahia/jahia-docker-mvn-cache:8-jdk-noble-mvn-loaded
6262
credentials:
63-
username: ${{ secrets.DOCKERHUB_USERNAME }}
64-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
63+
username: ${{ secrets.GH_PACKAGES_USERNAME }}
64+
password: ${{ secrets.GH_PACKAGES_TOKEN }}
6565
steps:
6666
- uses: actions/checkout@v3
6767
- uses: jahia/jahia-modules-action/publish@v2

.github/workflows/on-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
# downloading the entire world when building.
1616
# More on https://github.com/Jahia/cimg-mvn-cache
1717
container:
18-
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_8.0.312-node
18+
image: ghcr.io/jahia/jahia-docker-mvn-cache:8-jdk-noble-mvn-loaded
1919
credentials:
20-
username: ${{ secrets.DOCKERHUB_USERNAME }}
21-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
20+
username: ${{ secrets.GH_PACKAGES_USERNAME }}
21+
password: ${{ secrets.GH_PACKAGES_TOKEN }}
2222

2323
steps:
2424
# Providing the SSH PRIVATE of a user part of an admin group

.github/workflows/schedule-sonar.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
matrix:
2020
supported_branches: ["${{ github.event.repository.default_branch }}"]
2121
container:
22-
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_8.0.312-node
22+
image: ghcr.io/jahia/jahia-docker-mvn-cache:8-jdk-noble-mvn-loaded
2323
credentials:
24-
username: ${{ secrets.DOCKERHUB_USERNAME }}
25-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
24+
username: ${{ secrets.GH_PACKAGES_USERNAME }}
25+
password: ${{ secrets.GH_PACKAGES_TOKEN }}
2626
steps:
2727
- uses: actions/checkout@v3
2828
with:

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
"lint": "eslint --ext js,jsx,json .",
2323
"lint:fix": "eslint --ext js,jsx,json --fix ."
2424
},
25+
"resolutions": {
26+
"*/**/path-to-regexp": "1.9.0"
27+
},
2528
"dependencies": {
2629
"@jahia/data-helper": "^1.0.7",
2730
"@jahia/moonstone": "^2.5.7",
@@ -56,5 +59,6 @@
5659
"webpack": "^5.88.2",
5760
"webpack-bundle-analyzer": "^4.8.0",
5861
"webpack-cli": "^5.0.1"
59-
}
62+
},
63+
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
6064
}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4062,10 +4062,10 @@ path-parse@^1.0.7:
40624062
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
40634063
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
40644064

4065-
path-to-regexp@^1.7.0:
4066-
version "1.8.0"
4067-
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
4068-
integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
4065+
path-to-regexp@1.9.0, path-to-regexp@^1.7.0:
4066+
version "1.9.0"
4067+
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24"
4068+
integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==
40694069
dependencies:
40704070
isarray "0.0.1"
40714071

0 commit comments

Comments
 (0)