diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml index 32c6ad22..e6c0cac7 100644 --- a/.github/workflows/installer.build.yml +++ b/.github/workflows/installer.build.yml @@ -82,9 +82,13 @@ jobs: with: name: ZitiDesktopEdgeClient-${{ env.VERSION }} path: "Installer/Output/Ziti Desktop Edge Client-*" + - name: Git Status + run: git status + - name: git diff + run: git diff DesktopEdge/Properties/AssemblyInfo.cs ZitiDesktopEdge.Client/Properties/AssemblyInfo.cs ZitiUpdateService/Properties/AssemblyInfo.cs - if: github.ref == 'refs/heads/release-next' uses: EndBug/add-and-commit@v9 with: - add: './DesktopEdge/Properties/AssemblyInfo.cs ./ZitiDesktopEdge.Client/Properties/AssemblyInfo.cs ./ZitiUpdateService/Properties/AssemblyInfo.cs' + add: 'DesktopEdge/Properties/AssemblyInfo.cs ZitiDesktopEdge.Client/Properties/AssemblyInfo.cs ZitiUpdateService/Properties/AssemblyInfo.cs' default_author: github_actions committer_name: ziti-ci \ No newline at end of file diff --git a/.github/workflows/main.yml.off b/.github/workflows/main.yml.off deleted file mode 100644 index 80a80ac5..00000000 --- a/.github/workflows/main.yml.off +++ /dev/null @@ -1,39 +0,0 @@ -name: CI - -on: - push: - branches: - - dev - tags: - - "v*-beta.*" - - "v*-rc.*" - pull_request: - branches: - - "release*" - - "test-git-push" - -env: - BUILD_CONFIG: "Release" - BUILDNUMBER: ${{github.run_number}} - -jobs: - Build: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1 - - - name: Setup NuGet.exe - uses: NuGet/setup-nuget@v1.0.2 - - - name: setup go - uses: actions/setup-go@v2 - - - name: Setup Ninja - uses: ashutoshvarma/setup-ninja@master - - - name: Build - shell: cmd - run: ./service/publish.bat \ No newline at end of file