Skip to content

A self-hosted media server and file management system

ci: change permissions order and add changelog to beta releases?

aminnausin94b1fd5f0659
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index ad06669e..0e765340 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -42,6 +42,7 @@ jobs:
fail-fast: true
outputs:
tag: ${{ steps.beta.outputs.TAG }}
+ previous_tag: ${{ steps.beta.outputs.PREVIOUS_TAG }}
steps:
- name: Checkout Repository
@@ -93,10 +94,15 @@ jobs:
TAG="${NEW_VERSION}-beta.${BUILD_COUNT}"
- echo "::notice::Beta Tag: $TAG"
+ PREVIOUS_TAG=$(git tag --list --sort=-version:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | head -n1)
+ PREVIOUS_TAG=${PREVIOUS_TAG:-}
+
+ echo "::notice::Release Tag: $TAG"
+ echo "::notice::Previous Tag: $PREVIOUS_TAG"
echo "$NEW_VERSION" > $VERSION_FILE
echo "TAG=$TAG" >> $GITHUB_OUTPUT
+ echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_OUTPUT
- name: Commit updated VERSION file and manifest
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3
@@ -121,28 +127,42 @@ jobs:
git tag "$TAG"
git push origin "$TAG"
+ # ==========================
+ # Generate Changelog
+ # ==========================
+ generate-changelog:
+ name: Generate Changelog
+ needs: beta-flow
+ permissions:
+ contents: write
+ uses: ./.github/workflows/generate-changelog.yml
+ with:
+ previous_tag: ${{ needs.beta-flow.outputs.previous_tag }}
+ tag: ${{ needs.beta-flow.outputs.tag }}
+ branch: prod
+
# ==========================
# Publish Docker Image
# ==========================
build-docker:
needs: [ beta-flow ]
+ permissions:
+ contents: write
uses: ./.github/workflows/release-docker.yml
+ secrets: inherit
with:
docker_tag: 'beta'
version_tag: ${{ needs.beta-flow.outputs.tag }}
branch: main
- permissions:
- contents: write
- secrets: inherit
# ==========================
# Release Docker Setup Pkg
# ==========================
release:
needs: [ build-docker, beta-flow ]
- uses: ./.github/workflows/release-github.yml
permissions:
contents: write
+ uses: ./.github/workflows/release-github.yml
secrets: inherit
with:
tag: ${{ needs.beta-flow.outputs.tag }}
diff --git a/.github/workflows/ci-prod.yml b/.github/workflows/ci-prod.yml
index 6d56cde8..255af625 100644
--- a/.github/workflows/ci-prod.yml
+++ b/.github/workflows/ci-prod.yml
@@ -89,36 +89,36 @@ jobs:
generate-changelog:
name: Generate Changelog
needs: release-flow
+ permissions:
+ contents: write
uses: ./.github/workflows/generate-changelog.yml
with:
previous_tag: ${{ needs.release-flow.outputs.previous_tag }}
tag: ${{ needs.release-flow.outputs.tag }}
branch: prod
- permissions:
- contents: write
# ==========================
# Publish Docker Image
# ==========================
build-docker:
needs: [ release-flow ]
+ permissions:
+ contents: write
+ secrets: inherit
uses: ./.github/workflows/release-docker.yml
with:
docker_tag: 'latest'
version_tag: ${{ needs.release-flow.outputs.tag }}
branch: prod
- permissions:
- contents: write
- secrets: inherit
# ==========================
# Release Docker Setup Pkg (Always)
# ==========================
release:
needs: [ build-docker, release-flow, generate-changelog ]
- uses: ./.github/workflows/release-github.yml
permissions:
contents: write
+ uses: ./.github/workflows/release-github.yml
secrets: inherit
with:
tag: ${{ needs.release-flow.outputs.tag }}
diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
index 788c58a7..dfea89ad 100644
--- a/.github/workflows/release-github.yml
+++ b/.github/workflows/release-github.yml
@@ -132,3 +132,4 @@ jobs:
**Docker Setup Files**
No Docker-related files were changed in this release. To get the Docker setup packages, download them from a [previous release with Docker changes](https://github.com/${{ github.repository }}/releases).
+ prerelease: ${{ inputs.is_prerelease }}