fix: Fix embedded binaries, which had become corrupted in 6.1.13 (#159

)

.github/workflows/main.yml

@@ -16,26 +16,85 @@ jobs:
   build:
     name: "Build and Package"
     runs-on: ubuntu-latest
+    env:
+      OCTOPUS_API_KEY: ${{ secrets.OCTOPUS_APIKEY }}
+      OCTOPUS_HOST: ${{ secrets.OCTOPUS_SERVER }}
+
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: '0'
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-
-      - name: Build with gradle
-        run: ./gradlew build test
-
-      - name: Create Plugin Zip Deployment
-        run: ./gradlew distZip
-
-      - name: Execute end-2-end tests
-        run: ./gradlew e2etest
-        env:
-          OCTOPUS_LICENSE: ${{ secrets.OCTOPUS_LICENSE }}
-          OCTOPUS_SDK_AT_USE_EXISTING_SERVER: false
+    - name: Checkout Code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: '0'
+
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+
+    - name: Install GitVersion
+      uses: gittools/actions/gitversion/[email protected]
+      with:
+        versionSpec: '5.x'
+
+    - name: Call GitVersion
+      uses: gittools/actions/gitversion/[email protected]
+
+    - name: Determine Version
+      id: git-version
+      run: |
+        if [ "${{ github.event_name }}" == "schedule" ]
+        then
+          echo "::set-output name=nuGetVersion::${GITVERSION_MAJORMINORPATCH}-nightly-${{ github.run_number }}"
+          echo "Version: ${GITVERSION_MAJORMINORPATCH}-nightly-${{ github.run_number }}"
+        else
+          echo "::set-output name=nuGetVersion::${GITVERSION_FULLSEMVER}"
+          echo "Version: ${GITVERSION_FULLSEMVER}"
+        fi
+
+    - name: Build with gradle
+      run: ./gradlew build test -Pversion=${{ steps.git-version.outputs.nugetVersion }}
+
+    - name: Create Plugin Zip Deployment
+      id: create-package
+      run: |
+        ./gradlew distZip -Pversion=${{ steps.git-version.outputs.nugetVersion }}
+        PACKAGE_NAME=`./gradlew -q packageName  -Pversion=${{ steps.git-version.outputs.nugetVersion }}`
+        echo "::set-output name=package-created::$PACKAGE_NAME"
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: Octopus.TeamCity.${{ steps.git-version.outputs.nugetVersion }}
+        path: '${{ steps.create-package.outputs.package-created }}'
+
+    - name: Execute end-2-end tests
+      run: ./gradlew e2etest -Pversion=${{ steps.git-version.outputs.nugetVersion }}
+      env:
+        OCTOPUS_LICENSE: ${{ secrets.OCTOPUS_LICENSE }}
+        OCTOPUS_SDK_AT_USE_EXISTING_SERVER: false
+
+    - name: Install Octopus CLI 🐙
+      uses: OctopusDeploy/install-octopus-cli-action@v1
+
+    - name: Push a package to Octopus Deploy 🐙
+      uses: OctopusDeploy/push-package-action@v2
+      with:
+        space: 'Integrations'
+        packages: '${{ steps.create-package.outputs.package-created }}'
+
+    - name: Fetch Release Notes
+      id: fetch-release-notes
+      if: github.event_name == 'release'
+      run: |
+        echo "::debug::${{github.event_name}}"
+        OUTPUT_FILE="release_notes.txt"
+        jq --raw-output '.release.body' ${{ github.event_path }} | sed 's#\r#  #g' > $OUTPUT_FILE
+        echo "::set-output name=release-note-file::$OUTPUT_FILE"
+
+    - name: Create a release in Octopus Deploy 🐙
+      uses: OctopusDeploy/create-release-action@v2
+      with:
+        space: 'Integrations'
+        project: 'TeamCity Plugin'
+        package_version: ${{ steps.git-version.outputs.nugetVersion }}
+        release_notes_file: ${{ steps.fetch-release-notes.outputs.release-note-file }}

.github/workflows/release.yml

@@ -1,77 +1,13 @@
-name: Push to Octopus Server
-
 on:
-  release:
-    types: [created]
-
-  workflow_dispatch:
-    inputs:
-      release-tag:
-        description: "The tag of the release being replicated in Octopus Deploy"
-        required: true
-
+  push:
+    branches:
+      - main
+name: release-please
 jobs:
-  build:
-    name: "Push Package and Create Release"
+  release-please:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
+      - uses: google-github-actions/release-please-action@v3
         with:
-          fetch-depth: '0'
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-
-      - name: Build with gradle
-        run: ./gradlew build test
-
-      - name: Create Plugin Zip Deployment
-        id: create-package
-        run: |
-          ./gradlew distZip
-          PACKAGE_NAME=`./gradlew -q packageName`
-          echo "::set-output name=package-created::$PACKAGE_NAME"
-          VERSION=`./gradlew properties | grep ^version | awk '{print $2;}'`
-          echo "::set-output name=version::$VERSION"
-
-      - name: Install Octopus CLI 🐙
-        uses: OctopusDeploy/[email protected]
-
-      - name: Push a package to Octopus Deploy 🐙
-        uses: OctopusDeploy/[email protected]
-        with:
-          overwrite_mode: IgnoreIfExists
-          api_key: ${{ secrets.OCTOPUS_APIKEY }}
-          packages: "${{ steps.create-package.outputs.package-created }}"
-          server: ${{ secrets.OCTOPUS_SERVER }}
-          space: "Integrations"
-
-      - name: Fetch Release Notes
-        id: fetch-release-notes
-        run: |
-          echo "::debug::${{github.event_name}}"
-          OUTPUT_FILE="release_notes.txt"
-          if [[ "${{github.event_name}}" = "release" ]]; then
-           jq --raw-output '.release.body' ${{ github.event_path }} | sed 's#\r#  #g' > $OUTPUT_FILE
-          else
-             RELEASE_URL=$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/releases/tags/${{github.event.inputs.release-tag}}
-             echo $RELEASE_URL
-             echo "::debug::Fetching relesae from $RELEASE_URL"
-             curl -s -H "Accept: application/vnd.github.v3+json" $RELEASE_URL | jq --raw-output '.body' | sed 's#\r#  #g' > $OUTPUT_FILE
-          fi
-          echo "::set-output name=release-note-file::$OUTPUT_FILE"
-
-      - name: Create a release in Octopus Deploy 🐙
-        uses: OctopusDeploy/[email protected]
-        with:
-          api_key: ${{ secrets.OCTOPUS_APIKEY }}
-          server: ${{ secrets.OCTOPUS_SERVER }}
-          space: "Integrations"
-          project: "TeamCity Plugin"
-          package_version: ${{ steps.create-package.outputs.version }}
-          release_number: ${{ steps.create-package.outputs.version }}
-          release_notes_file: ${{ steps.fetch-release-notes.outputs.release-note-file }}
+          release-type: simple
+          token: ${{ secrets.INTEGRATIONS_FNM_BOT_TOKEN }}

gradle.properties

@@ -1 +1 @@
-version=6.1.13
+version=6.1.14-SNAPSHOT