Skip to content

Commit

Permalink
chore(dev-flow): maintain latest changes in main branch
Browse files Browse the repository at this point in the history
get rid of the dev branch
eclipse-tractusx/portal#243
  • Loading branch information
evegufy committed Jun 20, 2024
1 parent b474d88 commit cf46099
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ updates:
# NPM
-
package-ecosystem: "npm"
target-branch: dev
directory: /
labels:
- "dependabot"
Expand All @@ -43,7 +42,6 @@ updates:
# Github Actions
-
package-ecosystem: "github-actions"
target-branch: dev
directory: /
labels:
- "dependabot"
Expand All @@ -57,7 +55,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 @@ -22,7 +22,7 @@ name: build
on:
push:
branches:
- 'dev'
- 'main'
workflow_dispatch:

env:
Expand Down Expand Up @@ -80,7 +80,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 @@ -125,5 +125,5 @@ jobs:
--url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-registration-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 @@ -170,7 +170,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, master ]
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.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

0 comments on commit cf46099

Please sign in to comment.