diff --git a/.github/workflows/check-transmission-releases.yml b/.github/workflows/check-transmission-releases.yml index f1a2b5955..35053f46f 100644 --- a/.github/workflows/check-transmission-releases.yml +++ b/.github/workflows/check-transmission-releases.yml @@ -12,16 +12,20 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: + token: ${{ secrets.PAT }} ref: dev - name: Check for new version of Transmission run: | - LATEST_VERSION=$(curl -L https://api.github.com/repos/transmission/transmission/releases/latest | grep tag_name | awk '{print $2}' | sed -e 's/"//g' -e 's/,//') - CURRENT_VERSION=$(cat upstream/transmission-version.txt) - if [ "$LATEST_VERSION" != "$CURRENT_VERSION" ]; then + LATEST_SHA=$(curl -L https://api.github.com/repos/transmission/transmission/tags | tac | tac | awk '/sha/ {print $2; exit}' | sed -e 's/[",]//g') + LATEST_VERSION=$(curl -L https://api.github.com/repos/transmission/transmission/releases/latest | awk '/tag_name/ {print $2}' | sed -e 's/[",]//g') + CURRENT_SHA=$(cat upstream/transmission-sha.txt) + if [ "$LATEST_SHA" != "$CURRENT_SHA" -a -n "$LATEST_SHA" -a -n "$LATEST_VERSION" ]; then + echo "$LATEST_SHA" > upstream/transmission-sha.txt echo "$LATEST_VERSION" > upstream/transmission-version.txt git config --global user.email "workflow@github.com" git config --global user.name "workflow runner" + git add upstream/transmission-sha.txt git add upstream/transmission-version.txt git config user.email "transmission-bot@users.noreply.github.com" git config user.name "Transmission-Bot" diff --git a/.github/workflows/docker-image-builds.yml b/.github/workflows/docker-image-builds.yml index 4e48a4f4d..bb00cdfc5 100644 --- a/.github/workflows/docker-image-builds.yml +++ b/.github/workflows/docker-image-builds.yml @@ -4,6 +4,16 @@ on: branches: - master - dev + paths-ignore: + - README.md + - docker-compose.yml + - mkdocs.yml + - .github/** + - docs/* + - images/* + - upstream/Dockerfile + - upstream/transmission-sha.txt + - upstream/transmission-version.txt tags: - 'v[0-9]+.[0-9]+.[0-9]+' diff --git a/.github/workflows/docker-transmission-builds.yml b/.github/workflows/docker-transmission-builds.yml index 2581e9030..a4820b402 100644 --- a/.github/workflows/docker-transmission-builds.yml +++ b/.github/workflows/docker-transmission-builds.yml @@ -14,6 +14,9 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + token: ${{ secrets.PAT }} + ref: dev # Get latest version of Transmission - name: Get Transmission version @@ -58,3 +61,14 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha, scope=${{ github.workflow }} cache-to: type=gha, scope=${{ github.workflow}} + + - name: Update build-version.txt + run: | + echo "$LATEST_VERSION" > upstream/build-version.txt + git config --global user.email "workflow@github.com" + git config --global user.name "workflow runner" + git add upstream/build-version.txt + git config user.email "transmission-bot@users.noreply.github.com" + git config user.name "Transmission-Bot" + git commit -m "update image build version to ${LATEST_VERSION}" + git push origin dev diff --git a/upstream/build-version.txt b/upstream/build-version.txt new file mode 100644 index 000000000..7636e7565 --- /dev/null +++ b/upstream/build-version.txt @@ -0,0 +1 @@ +4.0.5 diff --git a/upstream/transmission-sha.txt b/upstream/transmission-sha.txt new file mode 100644 index 000000000..8d84146f7 --- /dev/null +++ b/upstream/transmission-sha.txt @@ -0,0 +1 @@ +a6fe2a64aa7eca089f96006cf082a12f0cde937f diff --git a/upstream/transmission-version.txt b/upstream/transmission-version.txt index d13e837c8..7636e7565 100644 --- a/upstream/transmission-version.txt +++ b/upstream/transmission-version.txt @@ -1 +1 @@ -4.0.6 +4.0.5