Skip to content

Commit

Permalink
fix(CI): Fixed build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
SaptarshiSarkar12 committed Feb 21, 2024
1 parent 1f9a567 commit a69114d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
shell: bash
run: |
if ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-14' }}; then
mvn -P build-drifty-cli-for-macos-latest package -rf :CLI
mvn -P build-drifty-cli-for-macos-latest package
else
mvn -P build-drifty-cli-for-${{ matrix.os }} package -rf :CLI
mvn -P build-drifty-cli-for-${{ matrix.os }} package
fi
- name: Set Up Maven version 3.8.8 # For GUI build issues, maven version 3.8.8 needs to be used
if: ${{ matrix.mode == 'GUI' }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/dev-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
os: [ 'ubuntu-latest', 'macos-14' ] # ubuntu-latest and macos-14 has amd64 and arm64 architecture respectively.
image_name_suffix: [ 'base', 'runner', 'cli', 'gui' ]
image_name_suffix: [ 'cli', 'gui' ]
fail-fast: false
permissions:
security-events: write
Expand All @@ -29,7 +29,10 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Build Docker image
run: docker compose build ${{ matrix.image_name_suffix }}
run: |
docker compose build base
docker compose build runner
docker compose build ${{ matrix.image_name_suffix }}
- name: Run Trivy security scan
uses: aquasecurity/trivy-action@0.17.0
continue-on-error: true
Expand Down

0 comments on commit a69114d

Please sign in to comment.