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

chore(dev-flow): maintain latest changes in main branch #882

Merged
merged 1 commit into from
Jun 21, 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: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ version: 2
updates:
# NPM
- package-ecosystem: 'npm'
target-branch: dev
directory: /
labels:
- 'dependabot'
Expand All @@ -42,7 +41,6 @@ updates:

# Github Actions
- package-ecosystem: 'github-actions'
target-branch: dev
directory: /
labels:
- 'dependabot'
Expand All @@ -55,7 +53,6 @@ updates:

# Docker
- package-ecosystem: 'docker'
target-branch: dev
directory: ./.conf/
labels:
- 'dependabot'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ name: build
on:
push:
branches:
- 'dev'
- 'main'
workflow_dispatch:

env:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
with:
images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=dev
type=raw,value=main
type=raw,value=${{ github.sha }}

- name: Build and push Docker image
Expand Down Expand Up @@ -130,5 +130,5 @@ jobs:
--url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-image-update.yml/dispatches \
--header "authorization: Bearer $TOKEN" \
--header "Accept: application/vnd.github.v3+json" \
--data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
--data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
--fail
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: Check Dependencies

on:
push:
branches: [main, dev]
branches: [main]
pull_request:
types: [opened, synchronize, reopened]
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: 'KICS'

on:
push:
branches: [main, dev]
branches: [main]
# pull_request:
# The branches below must be a subset of the branches above
# branches: [main, master]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then
echo "branch=release-candidate" >> $GITHUB_OUTPUT
else
echo "branch=dev" >> $GITHUB_OUTPUT
echo "branch=main" >> $GITHUB_OUTPUT
fi
if: steps.hf-check.outputs.hf == 'false'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
# Depending on the location of your Docker container
# you need to change the path to the specific Docker registry.
#
name: 'Trivy Dev'
name: 'Trivy Main'

on:
push:
branches: [dev]
branches: [main]
# pull_request:
# The branches below must be a subset of the branches above
# branches: [ main ]
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
uses: aquasecurity/trivy-action@fd25fed6972e341ff0007ddb61f77e88103953c2 # v0.21.0
with:
# Path to Docker image
image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:dev'
image-ref: '${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:main'
format: 'sarif'
output: 'trivy-results2.sarif'
vuln-type: 'os,library'
Expand Down
Loading