Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QA-15083: Modify github workflow for 4_x branch #62

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/on-code-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- uses: actions/checkout@v3
- uses: Jahia/jahia-modules-action/static-analysis@v2
with:
node_version: 12
auditci_level: critical

build:
Expand Down Expand Up @@ -54,7 +53,7 @@ jobs:
- uses: actions/checkout@v3
- uses: jahia/jahia-modules-action/sonar-analysis@v2
with:
primary_release_branch: master
primary_release_branch: 4_x
github_pr_id: ${{github.event.number}}
sonar_url: ${{ secrets.SONAR_URL }}
sonar_token: ${{ secrets.SONAR_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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
name: On merge to 4_x

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

Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
publish:
name: Publish module
needs: build
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/4_x'
runs-on: ubuntu-latest
container:
image: jahia/cimg-mvn-cache:ga_cimg_openjdk_8.0.312-node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
name: Release Module
with:
github_slug: Jahia/tools
primary_release_branch: master
primary_release_branch: 4_x
release_id: ${{ github.event.release.id }}
release_version: ${{ github.event.release.tag_name }}
github_api_token: ${{ secrets.GH_API_TOKEN }}
Expand Down
Loading