diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b9f06a5..b89cdfc 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,7 +24,15 @@ env: jobs: build: - runs-on: ubuntu-latest + strategy: + matrix: + include: + - os: ubuntu-latest + arch: amd64 + - os: ubuntu-latest-arm + arch: arm64 + + runs-on: ${{ matrix.os }} permissions: contents: read packages: write @@ -78,7 +86,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/${{ matrix.arch }} cache-from: type=gha cache-to: type=gha,mode=max target: test @@ -93,7 +101,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64 + platforms: linux/${{ matrix.arch }} cache-from: type=gha cache-to: type=gha,mode=max build-args: GITHUB_BUILD=true,VERSION=${{ github.ref_name }} diff --git a/Dockerfile b/Dockerfile index 183a2d5..192e664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,9 +23,6 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh COPY pyproject.toml uv.lock ./ RUN uv sync -COPY github_actions_fix.sh ./ -RUN ./github_actions_fix.sh - COPY . . RUN cd .venv/lib/*/site-packages/seleniumbase/drivers && ln -s /usr/bin/chromedriver uc_driver diff --git a/cmd.sh b/cmd.sh index 055348e..2e41efc 100755 --- a/cmd.sh +++ b/cmd.sh @@ -1,7 +1,3 @@ #!/bin/sh -if [ -f ld_fix.sh ]; then - . ./ld_fix.sh -fi - uv run main.py \ No newline at end of file diff --git a/test.sh b/test.sh index 6bffd2c..7c142de 100755 --- a/test.sh +++ b/test.sh @@ -1,7 +1,3 @@ #!/bin/sh -if [ -f ./ld_fix.sh ]; then - . ./ld_fix.sh -fi - uv run pytest --retries 2 -n auto --xvfb \ No newline at end of file