diff --git a/.gitea/workflows/publish-artifact.yaml b/.gitea/workflows/publish-artifact.yaml index f9515d8..4fed28a 100644 --- a/.gitea/workflows/publish-artifact.yaml +++ b/.gitea/workflows/publish-artifact.yaml @@ -12,10 +12,6 @@ on: description: Branch reference required: true type: string - GRADLE_TASK: - description: Gradle task to run (e.g., 'build publish' or 'publishPluginMavenPublicationToGitHubPackagesRepository') - required: true - type: string secrets: CI_BOT_USERNAME: required: true @@ -26,22 +22,19 @@ jobs: publish-artifact: runs-on: ubuntu-latest steps: - - name: Checkout repository uses: actions/checkout@v4 with: fetch-depth: 1 ref: ${{ inputs.BRANCH_REFERENCE }} token: ${{ secrets.CI_BOT_TOKEN }} - - name: Set up JDK uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{ inputs.JAVA_VERSION }} - - name: Run Gradle - run: ./gradlew ${{ inputs.GRADLE_TASK }} + run: ./gradlew publishAllPublicationsToGiteaPackagesRepository shell: bash env: REPOSITORY_USER: ${{ secrets.CI_BOT_USERNAME }} diff --git a/.gitea/workflows/publish-container.yaml b/.gitea/workflows/publish-container.yaml new file mode 100644 index 0000000..758d581 --- /dev/null +++ b/.gitea/workflows/publish-container.yaml @@ -0,0 +1,36 @@ +name: Publish Docker Images + +on: + workflow_call: + inputs: + JAVA_VERSION: + description: Java version to use + required: false + type: string + default: '17' + PROJECT_VERSION: + description: Branch reference + required: true + type: string + PROJECT_NAME: + description: Project name + required: true + type: string + secrets: + CI_BOT_USERNAME: + required: true + CI_BOT_TOKEN: + required: true + +jobs: + publish-artifact: + runs-on: ubuntu-latest + steps: + - name: Print things + run: | + echo "A: ${{ vars.BOT_NAME }}" + echo "B: ${{ vars.BOT_EMAIL }}" + echo "C: ${{ inputs.JAVA_VERSION }}" + echo "D: ${{ inputs.PROJECT_VERSION }}" + echo "E: ${{ inputs.PROJECT_NAME }}" + echo "F: ${{ secrets.CI_BOT_USERNAME }}" diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml new file mode 100644 index 0000000..a5929ac --- /dev/null +++ b/.gitea/workflows/release.yaml @@ -0,0 +1,159 @@ +name: Release + +on: + workflow_call: + inputs: + JAVA_VERSION: + default: 17 + description: Java version to use + required: false + type: string + FAIL_FOR_NO_CHANGES: + default: true + description: Fail if there were no changes to release + required: false + type: boolean + DATABASE_FILES: + default: '' + description: Whether to handle database files + required: false + type: string + RELEASE_TYPE: + default: '' + description: Type of release (service, library, plugin, or catalog) + required: false + type: string + secrets: + CI_BOT_USERNAME: + required: true + CI_BOT_TOKEN: + required: true + +jobs: + release: + runs-on: ubuntu-latest + outputs: + project-name: ${{ steps.project.outputs.name }} + release-version: ${{ steps.project.outputs.version }} + has-changes: ${{ steps.project.outputs.change }} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.CI_BOT_TOKEN }} + - name: Set git credentials + run: | + git config --global user.name "${{ vars.BOT_NAME }}" + git config --global user.email "${{ vars.BOT_EMAIL }}" + echo "Set Git name: ${{ vars.BOT_NAME }}" + echo "Set Git email: ${{ vars.BOT_EMAIL }}" + - name: Extract project information + id: project + run: | + NAME=$(awk -F '=' '/^rootProject\.name/ { gsub(/[[:space:]]*/,"",$2); gsub(/"/,"",$2); print $2 }' settings.gradle.kts) + if [ -z "$NAME" ]; then + echo "Error: No application name found in settings.gradle.kts" >&2 + exit 1 + fi + VERSION=$(awk -F '=' '/^version[[:space:]]*=/{ gsub(/[[:space:]]*/,"",$2); sub(/-SNAPSHOT$/,"",$2); print $2 }' gradle.properties) + if [ -z "$VERSION" ]; then + echo "Error: No version found in gradle.properties" >&2 + exit 1 + fi + CHANGE="false" + if [[ $(git log -1 --pretty=%B) != *"[RELEASE] - Bump version"* ]]; then + CHANGE="true" + fi + echo "name=$NAME" >> $GITHUB_OUTPUT + echo "Extracted application name: $NAME" + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "Extracted application version: $VERSION" + echo "change=$CHANGE" >> $GITHUB_OUTPUT + echo "Has changes to release? $CHANGE" + - name: Fail workflow if there are no changes + if: steps.project.outputs.change == 'false' && inputs.FAIL_FOR_NO_CHANGES + run: | + echo "No changes to release, failing..." + exit 1 + - name: Un-snapshot catalog versions + if: ${{ inputs.RELEASE_TYPE == 'catalog' }} + run: | + if [ -f versions-catalog.toml ]; then + sed -i -E 's/^(lulz[A-Za-z]+[[:space:]]*=[[:space:]]*")([0-9]+\.[0-9]+\.[0-9]+)-SNAPSHOT(")/\1\2\3/' versions-catalog.toml + + if ! git diff --quiet versions-catalog.toml; then + git add versions-catalog.toml + echo "Versions catalog: updated" + else + echo "Versions catalog: no changes" + fi + fi + - name: Un-snapshot version and commit changes + run: | + sed -i "s/\(version\s*=\s*[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/" gradle.properties + sed -i "s/\(catalog\s*=\s*[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/" gradle.properties + if ! git diff --exit-code --quiet -- "gradle.properties"; then + git add gradle.properties + git commit -m "[RELEASE] - Release version: ${{ steps.project.outputs.version }}" + git push origin master + else + echo "No changes to commit" + fi + - name: Add release tag + run: | + git_tag="v${{ steps.project.outputs.version }}" + git tag -a "$git_tag" -m "Release version $git_tag" + git push origin "$git_tag" + - name: Archive database files and commit changes + if: ${{ inputs.DATABASE_FILES != '' }} + run: | + type="${{ inputs.DATABASE_FILES }}" + version_dir="${type}/v${{ steps.project.outputs.version }}" + if [ -d "$type" ] && [ -n "$(ls -A $type/*."$type" 2>/dev/null)" ]; then + mkdir -p "$version_dir" + mv "$type"/*."$type" "$version_dir/" + git add "$type" + git commit -m "[RELEASE] - Move $type files to ${version_dir}" + git push origin master + else + echo "No database files to process" + fi + - name: Snapshot version and commit changes + run: | + next_version=$(awk -F '.' '{print $1 "." $2+1 ".0"}' <<< "${{ steps.project.outputs.version }}") + sed -i "s/\(version\s*=\s*\)[0-9.]*/\1${next_version}-SNAPSHOT/" gradle.properties + echo "Bumped version to: ${next_version}-SNAPSHOT" + if ! git diff --exit-code --quiet -- "gradle.properties"; then + git add gradle.properties + git commit -m "[RELEASE] - Bump version" + git push origin master + else + echo "No changes to commit" + fi + + finalise-publish-artifact: + needs: release + if: inputs.RELEASE_TYPE == 'catalog' || inputs.RELEASE_TYPE == 'library' || inputs.RELEASE_TYPE == 'plugin' + uses: aura-ascend/common-workflows/.gitea/workflows/publish-artifact.yaml@master + with: + JAVA_VERSION: ${{ inputs.JAVA_VERSION }} + BRANCH_REFERENCE: "v${{ needs.release.outputs.release-version }}" + secrets: + CI_BOT_USERNAME: ${{ secrets.CI_BOT_USERNAME }} + CI_BOT_TOKEN: ${{ secrets.CI_BOT_TOKEN }} + + finalise-publish-container: + needs: release + # if: needs.release.outputs.has-changes == 'true' + # if: needs.release.outputs.has-changes == 'true' && inputs.RELEASE_TYPE == 'service' + uses: aura-ascend/common-workflows/.gitea/workflows/publish-container.yaml@master + with: + JAVA_VERSION: ${{ inputs.JAVA_VERSION }} + # PROJECT_VERSION: ${{ needs.release.outputs.release-version }} + PROJECT_VERSION: "v${{ needs.release.outputs.release-version }}" + PROJECT_NAME: ${{ needs.release.outputs.project-name }} + secrets: + CI_BOT_USERNAME: ${{ secrets.CI_BOT_USERNAME }} + CI_BOT_TOKEN: ${{ secrets.CI_BOT_TOKEN }} + diff --git a/README.md b/README.md index 236baac..6d6ce6d 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,11 @@ Rules and stuff say keep workflow in `/.gite/workflow` look at `/.gite/actions` ## Actions secrets and variables. ### Secrets + - CI_BOT_USERNAME = gitea_username - CI_BOT_TOKEN = gitea_token ### Variables +- BOT_NAME +- BOT_EMAIL