diff --git a/.github/workflows/autotag.yml b/.github/workflows/autotag.yml index 7c7c6f8..a56eaa9 100644 --- a/.github/workflows/autotag.yml +++ b/.github/workflows/autotag.yml @@ -1,4 +1,4 @@ -name: autotag +name: Autotag on: push: @@ -9,11 +9,10 @@ jobs: tag-release: runs-on: ubuntu-latest steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Auto Tag + - name: Checkout repository + uses: actions/checkout@v5 + + - name: Auto Tag uses: Klemensas/action-autotag@stable with: GITHUB_TOKEN: "${{ secrets.GH_PAT }}" diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index aac4c8a..4c2f326 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -1,4 +1,4 @@ -name: release-docker +name: Docker release on: push: @@ -15,10 +15,10 @@ concurrency: jobs: build-docker-images: if: ${{ !github.event.pull_request.head.repo.fork }} - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v5 - name: Downcase repo run: echo REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV @@ -43,8 +43,8 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v3 if: github.event_name != 'pull_request' + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd6f794..1eac55d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: release +name: Release on: push: @@ -8,12 +8,12 @@ on: jobs: create-release: name: Create release - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v5 with: - fetch-depth: 0 # get all commits, branches and tags (required for the changelog) + fetch-depth: 0 - name: Build changelog id: github_changelog @@ -22,74 +22,45 @@ jobs: changelog="${changelog//'%'/'%25'}" changelog="${changelog//$'\n'/'%0A'}" changelog="${changelog//$'\r'/'%0D'}" - echo "##[set-output name=changelog;]${changelog}" + echo "changelog=${changelog}" >> $GITHUB_ENV - name: Create release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GH_PAT }} + uses: softprops/action-gh-release@v2 with: tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - body: ${{ steps.github_changelog.outputs.changelog }} - draft: false - prerelease: false + name: ${{ github.ref }} + body: ${{ env.changelog }} + env: + GITHUB_TOKEN: ${{ secrets.GH_PAT }} - build-linux-package: - name: Build Linux binary + build-package: + name: Build binaries needs: create-release - runs-on: ubuntu-24.04 + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] steps: - - name: Checkout code - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v5 with: - fetch-depth: 0 # get all commits, branches and tags (required for the changelog) + fetch-depth: 0 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.13" - name: Build artifacts run: | python -m pip install -r requirements.txt - python -m pip install pyinstaller==6.14.2 + python -m pip install pyinstaller==6.16.0 cd src python build_package.py - name: Upload release artifacts - uses: alexellis/upload-assets@0.4.1 + uses: softprops/action-gh-release@v2 + with: + files: ./dist/flaresolverr_* env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} - with: - asset_paths: '["./dist/flaresolverr_*"]' - - build-windows-package: - name: Build Windows binary - needs: create-release - runs-on: windows-2022 - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 # get all commits, branches and tags (required for the changelog) - - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: "3.13" - - - name: Build artifacts - run: | - python -m pip install -r requirements.txt - python -m pip install pyinstaller==6.14.2 - cd src - python build_package.py - - - name: Upload release artifacts - uses: alexellis/upload-assets@0.4.1 - env: - GITHUB_TOKEN: ${{ secrets.GH_PAT }} - with: - asset_paths: '["./dist/flaresolverr_*"]' diff --git a/LICENSE b/LICENSE index 8f33130..c3bef0f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Diego Heras (ngosang / ngosang@hotmail.es) +Copyright (c) 2025 Diego Heras (ngosang / ngosang@hotmail.es) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/requirements.txt b/requirements.txt index cfa05f4..0567f4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ bottle==0.13.4 waitress==3.0.2 -selenium==4.34.2 +selenium==4.35.0 func-timeout==4.3.5 prometheus-client==0.22.1 -# required by undetected_chromedriver -requests==2.32.4 -certifi==2025.7.9 +# Required by undetected_chromedriver +requests==2.32.5 +certifi==2025.8.3 websockets==15.0.1 packaging==25.0 -# only required for linux and macos -xvfbwrapper==0.2.13; platform_system != "Windows" -# only required for windows +# Only required for Linux and macOS +xvfbwrapper==0.2.14; platform_system != "Windows" +# Only required for Windows pefile==2024.8.26; platform_system == "Windows"