Skip to content

Commit

Permalink
BACKLOG-22478: add dependency to legacy-default-components + 8.2.0.0 …
Browse files Browse the repository at this point in the history
…as parent (#24)

* BACKLOG-22478: add dependency to legacy-default-components + 8.2.0.0 as parent

* Fixed ci/cd for the repo

* BACKLOG-22478: upgrade major version

---------

Co-authored-by: Francois G <fgerthoffert@jahia.com>
  • Loading branch information
jkevan and Fgerthoffert authored Apr 2, 2024
1 parent b24cd19 commit 2682162
Show file tree
Hide file tree
Showing 8 changed files with 194 additions and 217 deletions.
165 changes: 0 additions & 165 deletions .circleci/config.yml

This file was deleted.

32 changes: 6 additions & 26 deletions .circleci/.circleci.settings.xml → .github/maven.settings.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
<?xml version="1.0"?>
<settings>
<profiles>
<profile>
<id>jahia-internal-repository</id>
<repositories>
<repository>
<id>jahia-internal</id>
<name>Jahia Internal Repository</name>
<url>${env.NEXUS_INTERNAL_URL}</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
</profile>
<profile>
<id>sonar</id>
<activation>
Expand All @@ -30,14 +12,9 @@
</properties>
</profile>
</profiles>

<activeProfiles>
<activeProfile>jahia-internal-repository</activeProfile>
</activeProfiles>

<servers>
<server>
<id>jahia-enterprise</id>
<id>jahia-public</id>
<username>${env.NEXUS_USERNAME}</username>
<password>${env.NEXUS_PASSWORD}</password>
</server>
Expand All @@ -47,9 +24,12 @@
<password>${env.NEXUS_PASSWORD}</password>
</server>
<server>
<id>jahia-internal</id>
<id>staging-repository</id>
<username>${env.NEXUS_USERNAME}</username>
<password>${env.NEXUS_PASSWORD}</password>
</server>
</servers>
</settings>
<pluginGroups>
<pluginGroup>org.owasp</pluginGroup>
</pluginGroups>
</settings>
59 changes: 59 additions & 0 deletions .github/workflows/on-code-change.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# This workflow is triggered every time a change is pushed to any branches
# Github actions command reference: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
name: On Code Change (PR)

# The workflow could also be triggered on PRs
on:
pull_request:
types: [opened, reopened, synchronize]

jobs:
update-signature:
name: Update module signature
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/update-signature@v2
with:
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}
nexus_enterprise_releases_url: ${{ secrets.NEXUS_ENTERPRISE_RELEASES_URL }}

static-analysis:
name: Static Analysis (linting, vulns)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: Jahia/jahia-modules-action/static-analysis@v2
with:
node_version: 21
auditci_level: critical

build:
name: Build Module
needs: update-signature
runs-on: ubuntu-latest
container:
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node
credentials:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
steps:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/build@v2
with:
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}

sonar-analysis:
name: Sonar Analysis
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/sonar-analysis@v2
with:
primary_release_branch: master
github_pr_id: ${{github.event.number}}
sonar_url: ${{ secrets.SONAR_URL }}
sonar_token: ${{ secrets.SONAR_TOKEN }}
56 changes: 56 additions & 0 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# This workflow is triggered every time a change is pushed to any branches
# Github actions command reference: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
name: On merge to master

# The workflow could also be triggered on PRs
on:
push:
branches:
- 'master'
tags-ignore:
- '**'

jobs:
update-signature:
name: Update module signature
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/update-signature@v2
with:
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}
nexus_enterprise_releases_url: ${{ secrets.NEXUS_ENTERPRISE_RELEASES_URL }}

build:
name: Build Module
needs: update-signature
runs-on: ubuntu-latest
container:
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node
credentials:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
steps:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/build@v2
with:
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}

publish:
name: Publish module
needs: build
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
container:
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node
credentials:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
steps:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/publish@v2
with:
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}
Loading

0 comments on commit 2682162

Please sign in to comment.