From bc39f1bc3b2bf31540c59d6c8e6d7568a0bb4b93 Mon Sep 17 00:00:00 2001 From: Matthew R Kasun Date: Thu, 23 Feb 2023 16:11:57 -0500 Subject: [PATCH] workflows --- .github/workflows/packages.yml | 2 +- .github/workflows/publish-docker.yml | 5 +++++ .github/workflows/pull-request.yml | 15 +++++++++++--- .github/workflows/release-assets.yml | 3 ++- .github/workflows/release-branch.yml | 6 +++++- .github/workflows/release.yml | 8 ++++---- .github/workflows/upgraderelease.yml | 30 ---------------------------- 7 files changed, 29 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/upgraderelease.yml diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 9b0563a4..28b9cb41 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -43,4 +43,4 @@ jobs: echo ${VERSION} - name: apt/rpm run: | - ssh fileserver.clustercat.com "cd packages/nmcli"; export VERSION=${{ ENV.version }}; export REVISION=0; ./buildall.sh " + ssh fileserver.clustercat.com "cd packages/nmcli; export VERSION=${{ ENV.version }}; export REVISION=0; ./buildall.sh " diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 85983833..1685954e 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -6,6 +6,11 @@ on: tag: description: 'docker tag' required: true + workflow_call: + inputs: + tag: + type: string + required: true jobs: docker: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 58ac1952..8dc3dc60 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -1,4 +1,5 @@ # creates a PR from release branch to master +name: Create Release PR to master on: workflow_call: inputs: @@ -10,14 +11,22 @@ on: version: description: "netmaker version" required: true + release: + types: [released] + jobs: pr-to-main: runs-on: ubuntu-latest steps: - name: create pr + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - curl -X POST -H 'Accept: application/vnd.github+json' -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}'\ - -H 'X-GitHub-Api-Version: 2022-11-28' https://api.github.com/repos/${{ github.repository }}/pulls \ - -d '{"title":"{{ github.event.inputs.version }}","head":"release_${{ github.event.inputs.version }}","base":"master"}' + gh api --method POST \ + -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: 2022-11-28' \ + /repos/${{ github.repository }}/pulls \ + -f title='${{ github.event.inputs.version }}' \ + -f head='release_${{ github.event.inputs.version }}' \ + -f base="master" diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml index c60efbc0..d1919d69 100644 --- a/.github/workflows/release-assets.yml +++ b/.github/workflows/release-assets.yml @@ -1,4 +1,5 @@ # generates release assets and uploads to release +name: Upload Release Assets on: workflow_call: inputs: @@ -44,6 +45,6 @@ jobs: if: ${{ github.event.inputs.prerelease == 'false'}} uses: goreleaser/goreleaser-action@v4 with: - args: release --clean --release-notes release.md f .goreleaser.prerelease.yaml + args: release --clean --release-notes release.md -f .goreleaser.prerelease.yaml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index 06d94926..2dfdf1c8 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -1,5 +1,6 @@ # creates new branch (release_{{ version }} with tag {{ version }} from develop # will fail if branch or tag already exists on github +name: Create Release Branch on: workflow_call: inputs: @@ -31,5 +32,8 @@ jobs: run: | git switch -c release_${{ github.event.inputs.version }} git tag -f ${{ github.event.inputs.version }} - git push origin --tags release_${{ github.event.inputs.version }} + #push branch + git push origin release_${{ github.event.inputs.version }} + #push tag + git push origin ${{ github.event.inputs.version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 937966dc..bcb8749e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,23 +26,23 @@ jobs: uses: ./.github/workflows/release-assets.yml with: version: ${{ github.event.inputs.version }} - prerelease: ${{ github.event.inputs.prerelease }} + prerelease: ${{ github.event.inputs.prerelease == 'true' }} docker: needs: release-branch uses: ./.github/workflows/publish-docker.yml with: - version: ${{ github.event.inputs.version }} + tag: ${{ github.event.inputs.version }} packages: - if: {{ github.event.inputs.prerelease == 'false' }} + if: ${{ github.event.inputs.prerelease == 'false' }} needs: release-branch uses: ./.github/workflows/packages.yml with: version: ${{ github.event.inputs.version }} pull-request: - if: {{ github.event.inputs.prerelease == 'false' }} + if: ${{ github.event.inputs.prerelease == 'false' }} needs: release-branch uses: ./.github/workflows/pull-request.yml with: diff --git a/.github/workflows/upgraderelease.yml b/.github/workflows/upgraderelease.yml deleted file mode 100644 index f8305c6d..00000000 --- a/.github/workflows/upgraderelease.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: UpgradeRelease - -on: - workflow_dispatch: - inputs: - version: - description: "new version number" - required: true - -jobs: - - build-packages: - uses: ./github/workflows/packages.yml - with: - version: ${{ github.event.inputs.version }} - - pr-to-main: - runs-on: ubuntu-latest - steps: - - name: create pr - run: | - curl \ - -X POST \ - -H 'Accept: application/vnd.github+json' \ - -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}'\ - -H 'X-GitHub-Api-Version: 2022-11-28' \ - https://api.github.com/repos/${{ github.repository }}/pulls \ - -d '{"title":"{{ github.event.inputs.version }}","head":"release_${{ github.event.inputs.version }}","base":"master"}' - -