Merge pull request #101 from the-luap/fix/codeql-v4-upgrade
fix: CI workflow fixes for protected branches
This commit is contained in:
@@ -137,7 +137,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload Trivy scan results to GitHub Security tab
|
- name: Upload Trivy scan results to GitHub Security tab
|
||||||
if: github.event_name != 'pull_request' && steps.login-ghcr.outcome == 'success'
|
if: github.event_name != 'pull_request' && steps.login-ghcr.outcome == 'success'
|
||||||
uses: github/codeql-action/upload-sarif@v3
|
uses: github/codeql-action/upload-sarif@v4
|
||||||
with:
|
with:
|
||||||
sarif_file: 'trivy-backend.sarif'
|
sarif_file: 'trivy-backend.sarif'
|
||||||
category: 'backend-vulnerabilities'
|
category: 'backend-vulnerabilities'
|
||||||
@@ -248,7 +248,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload Trivy scan results to GitHub Security tab
|
- name: Upload Trivy scan results to GitHub Security tab
|
||||||
if: github.event_name != 'pull_request' && steps.login-ghcr.outcome == 'success'
|
if: github.event_name != 'pull_request' && steps.login-ghcr.outcome == 'success'
|
||||||
uses: github/codeql-action/upload-sarif@v3
|
uses: github/codeql-action/upload-sarif@v4
|
||||||
with:
|
with:
|
||||||
sarif_file: 'trivy-frontend.sarif'
|
sarif_file: 'trivy-frontend.sarif'
|
||||||
category: 'frontend-vulnerabilities'
|
category: 'frontend-vulnerabilities'
|
||||||
|
|||||||
@@ -35,38 +35,3 @@ jobs:
|
|||||||
echo "" >> $GITHUB_STEP_SUMMARY
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "Docker images will be built and tagged with this beta version." >> $GITHUB_STEP_SUMMARY
|
echo "Docker images will be built and tagged with this beta version." >> $GITHUB_STEP_SUMMARY
|
||||||
|
|
||||||
# Sync version to package.json files after release
|
|
||||||
sync-versions:
|
|
||||||
needs: release-please
|
|
||||||
if: ${{ needs.release-please.outputs.release_created }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: beta
|
|
||||||
|
|
||||||
- name: Update package.json versions
|
|
||||||
run: |
|
|
||||||
VERSION="${{ needs.release-please.outputs.version }}"
|
|
||||||
echo "Updating package.json files to version $VERSION"
|
|
||||||
|
|
||||||
# Update backend package.json
|
|
||||||
cd backend
|
|
||||||
npm version $VERSION --no-git-tag-version --allow-same-version
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Update frontend package.json
|
|
||||||
cd frontend
|
|
||||||
npm version $VERSION --no-git-tag-version --allow-same-version
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
- name: Commit version updates
|
|
||||||
run: |
|
|
||||||
git config user.name "github-actions[bot]"
|
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
|
||||||
git add backend/package.json frontend/package.json
|
|
||||||
git diff --staged --quiet || git commit -m "chore: sync package.json versions to ${{ needs.release-please.outputs.version }}"
|
|
||||||
git push
|
|
||||||
|
|||||||
@@ -34,38 +34,3 @@ jobs:
|
|||||||
echo "" >> $GITHUB_STEP_SUMMARY
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "Docker images will be built and tagged with this version." >> $GITHUB_STEP_SUMMARY
|
echo "Docker images will be built and tagged with this version." >> $GITHUB_STEP_SUMMARY
|
||||||
|
|
||||||
# Sync version to package.json files after release
|
|
||||||
sync-versions:
|
|
||||||
needs: release-please
|
|
||||||
if: ${{ needs.release-please.outputs.release_created }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: main
|
|
||||||
|
|
||||||
- name: Update package.json versions
|
|
||||||
run: |
|
|
||||||
VERSION="${{ needs.release-please.outputs.version }}"
|
|
||||||
echo "Updating package.json files to version $VERSION"
|
|
||||||
|
|
||||||
# Update backend package.json
|
|
||||||
cd backend
|
|
||||||
npm version $VERSION --no-git-tag-version --allow-same-version
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Update frontend package.json
|
|
||||||
cd frontend
|
|
||||||
npm version $VERSION --no-git-tag-version --allow-same-version
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
- name: Commit version updates
|
|
||||||
run: |
|
|
||||||
git config user.name "github-actions[bot]"
|
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
|
||||||
git add backend/package.json frontend/package.json
|
|
||||||
git diff --staged --quiet || git commit -m "chore: sync package.json versions to ${{ needs.release-please.outputs.version }}"
|
|
||||||
git push
|
|
||||||
|
|||||||
@@ -24,7 +24,18 @@
|
|||||||
".": {
|
".": {
|
||||||
"release-type": "simple",
|
"release-type": "simple",
|
||||||
"changelog-path": "CHANGELOG.md",
|
"changelog-path": "CHANGELOG.md",
|
||||||
"extra-files": []
|
"extra-files": [
|
||||||
|
{
|
||||||
|
"type": "json",
|
||||||
|
"path": "backend/package.json",
|
||||||
|
"jsonpath": "$.version"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "json",
|
||||||
|
"path": "frontend/package.json",
|
||||||
|
"jsonpath": "$.version"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,18 @@
|
|||||||
".": {
|
".": {
|
||||||
"release-type": "simple",
|
"release-type": "simple",
|
||||||
"changelog-path": "CHANGELOG.md",
|
"changelog-path": "CHANGELOG.md",
|
||||||
"extra-files": []
|
"extra-files": [
|
||||||
|
{
|
||||||
|
"type": "json",
|
||||||
|
"path": "backend/package.json",
|
||||||
|
"jsonpath": "$.version"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "json",
|
||||||
|
"path": "frontend/package.json",
|
||||||
|
"jsonpath": "$.version"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user