Skip to content

Commit

Permalink
[PR-FIXES]
Browse files Browse the repository at this point in the history
  • Loading branch information
erikzaadi committed Oct 27, 2024
1 parent 78ad401 commit dfacbf1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/actions/build-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ inputs:
runs:
using: 'composite'
steps:
# - name: Setup docker (missing on MacOS)
# if: matrix.platform == 'linux/arm64'
# uses: douglascamata/setup-docker-macos-action@v1-alpha

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
if: ${{ inputs.skip-init == '' }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
echo $(echo ${integrations_to_build[@]} | jq -R -c 'split(" ")')
echo "INTEGRATIONS_MATRIX=$(echo ${integrations_to_build[@]} | jq -R -c 'split(" ")')" >> $GITHUB_OUTPUT
build-integration:
runs-on: 'ubuntu-latest'
if: needs.prepare-matrix.outputs.matrix != '[]'
Expand Down Expand Up @@ -101,4 +100,4 @@ jobs:
INTEGRATION_VERSION=${{ steps.prepare_tags.outputs.version }}
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
skip-push: 'yupp'
skip-push: 'true'
5 changes: 2 additions & 3 deletions .github/workflows/docker-images-security-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4


- name: Extract version and image tag
id: enrich-version
run: |
Expand All @@ -96,9 +95,9 @@ jobs:
with:
dockerfile: ./integrations/_infra/Dockerfile
platforms: linux/amd64
skip-push: 'yupp'
skip-push: 'true'
tags: ${{ steps.enrich-version.outputs.image_tag }}
load-created-image: 'yupp'
load-created-image: 'true'
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
build-args: |
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ jobs:
detect-changes:
uses: ./.github/workflows/detect-changes-matrix.yml
build-infra:
# runs-on: ${{ matrix.platform == 'linux/arm64' && 'macos-13' || 'ubuntu-latest' }}
runs-on: 'ubuntu-latest'
needs: detect-changes
if: ${{ needs.detect-changes.outputs.infra == 'true' }}
Expand All @@ -24,7 +23,6 @@ jobs:
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}


- name: Build Docker Image
uses: ./.github/workflows/actions/build-docker-image
with:
Expand All @@ -33,4 +31,4 @@ jobs:
tags: ghcr.io/port-labs/port-ocean-base-runner:latest
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
skip-init: 'yupp'
skip-init: 'true'
2 changes: 1 addition & 1 deletion .github/workflows/release-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
needs: [prepare-matrix]
strategy:
# limit the number of parallel jobs to avoid hitting the ghcr.io rate limit
max-parallel: 10
max-parallel: 5
matrix:
integration: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
steps:
Expand Down

0 comments on commit dfacbf1

Please sign in to comment.