diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 379aaaa..4d232e2 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -25,22 +25,22 @@ jobs: uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 # https://github.com/docker/setup-buildx-action - + - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 - + uses: docker/setup-buildx-action@v3 + - name: Log in to Docker Hub - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - + - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 with: images: bellingcat/auto-archiver diff --git a/.github/workflows/python-publish.yaml b/.github/workflows/python-publish.yaml index b63a560..5badd29 100644 --- a/.github/workflows/python-publish.yaml +++ b/.github/workflows/python-publish.yaml @@ -22,27 +22,20 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Extract Python Version from pyproject.toml - id: python-version - run: | - version=$(grep 'python =' pyproject.toml | awk -F'"' '{print $2}' | tr -d '^~<=>') - echo "python-version=$version" >> $GITHUB_ENV + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: ${{ env.python-version }} + python-version-file: pyproject.toml - name: Install Poetry run: | - python -m pip install --upgrade pip - python -m pip install "poetry>=2.0.0,<3.0.0" + pipx install "poetry>=2.0.0,<3.0.0" - name: Install dependencies run: | - poetry install --no-root + poetry install --no-interaction --no-root - name: Build the package run: | diff --git a/Dockerfile b/Dockerfile index 3b1e252..0ecc7f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN add-apt-repository ppa:mozillateam/ppa && \ apt-get install -y --no-install-recommends gcc ffmpeg fonts-noto exiftool && \ apt-get install -y --no-install-recommends firefox-esr && \ ln -s /usr/bin/firefox-esr /usr/bin/firefox && \ - wget https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz && \ + wget https://github.com/mozilla/geckodriver/releases/download/v0.35.0/geckodriver-v0.35.0-linux64.tar.gz && \ tar -xvzf geckodriver* -C /usr/local/bin && \ chmod +x /usr/local/bin/geckodriver && \ rm geckodriver-v* && \