diff --git a/.appveyor.yml b/.appveyor.yml index be22d5fb8..6193c077b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2017 -version: '0.4.{build}' +version: '0.5.{build}' configuration: - Debug diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb1b67c8c..27efec31e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: run: | echo github.event.action: ${{ github.event.action }} echo github.event_name: ${{ github.event_name }} - + echo github.ref ${{github.ref}} - name: Install dependencies on windows if: startsWith(matrix.config.os, 'windows') @@ -97,7 +97,7 @@ jobs: ${{ matrix.config.archiver }} ${{ matrix.config.artifact }} bin/${{ matrix.config.build_type }}/ Resources/ README.md LICENSE CHANGELOG.md TDEngine2/ - name: Deploy - if: github.ref == 'refs/heads/master' && github.event.action == 'push' + if: contains( ${{ github.head_ref }}, 'master' ) id: create_release uses: actions/create-release@v1 env: @@ -108,13 +108,13 @@ jobs: draft: false prerelease: false - # - name: Upload release asset - # if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'created') - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ github.event.release.upload_url }} - # asset_path: ./${{ matrix.config.artifact }} - # asset_name: ${{ matrix.config.artifact }}.zip - # asset_content_type: application/zip + - name: Upload Archive + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: ./${{ matrix.config.artifact }} + asset_name: ${{ matrix.config.artifact }} + asset_content_type: application/zip diff --git a/.travis.yml b/.travis.yml index 84ddb746e..733d611bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_deploy: deploy: provider: releases - name: TDEngine2_SDK-v0.4-linux + name: TDEngine2_SDK-v0.5-linux api_key: secure: Nw5dmR6F5NC1FVhZQunHOpppjLtNjdgezW0baCJLW1mXvtvWUo9rX+eMCKNk+e02h2VQuxRyfiUe31DW3CbhO5rKNl8Aq31Zobnp9+zGTHVD+Iyz584hK2/zpqOLcHXru+BqYh2VGX1yW0Hv0EExj8zNfI6JSfqI7hHGRPcHnUfSEy6CMO56W0pLbet+EFZUpghSbsG61NCvmG0HTDItox8GsVSQcTfRij0/ckfvgOK10qv0agK2Oar9wQSFMG30Td7lM3oBV4OfBdB4y6eK5TVNPld4rzqFgc0yLdF0Nh581/WoD9kvMBzh0vte+mpEipeFmxGcgDZUcrmVvKGmAX2960z7Ujs/BYVLlgM9aNzQVoHApn0PyAm7qCdOdijE8OIwiVB1i2xz2P0oUQaxOsLTKVUcJ467OpkraxLOmn9nhfehm0H5BaVJLR0ACtZq474d54Je8bvO1TyEUAL2HvY2zVodw5mWwJLbKpDKB6ceSkFyTAWsB2bUIi1xjzkQQ5cCCjyFgrtxvo4KwddQx2NGD3Q/Q/eNGUDS5h1vlJt1CGkFHYp8Dyweae3YIHv+Y9lN4njh9gAnT3kzxhsIjTI14ynUFoe3Bcx2tXr+e8eeWOVFj4SBKJIQl00RdO4RLi/mC3gldrriRH5k9XdppmEejahZAkS1uGkLVPy3Y2I=