workflows

.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 "

.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:

.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 }}'\
+          gh api --method POST \
-          -H 'X-GitHub-Api-Version: 2022-11-28'  https://api.github.com/repos/${{ github.repository }}/pulls \
+          -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: 2022-11-28'  \
-          -d '{"title":"{{ github.event.inputs.version }}","head":"release_${{ github.event.inputs.version }}","base":"master"}'
+          /repos/${{ github.repository }}/pulls \
+          -f title='${{ github.event.inputs.version }}' \
+          -f head='release_${{ github.event.inputs.version }}' \
+          -f base="master"
 
 

.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 }}

.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 }}
   

.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:

.github/workflows/upgraderelease.yml

@@ -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"}'
-
-