From 706ccd005bb110e9de472903c2330f9fb47edf97 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Thu, 16 Mar 2023 19:22:57 +0100 Subject: [PATCH] Merge Workflows --- .github/workflows/master-build.yml | 21 ++++++++++++++++++++- .github/workflows/release-build.yml | 29 ----------------------------- 2 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 .github/workflows/release-build.yml diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index 70320f4..ae84070 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -3,13 +3,14 @@ name: Master Build on: push: branches: [ "master" ] + pull_request: + branches: [ "master" ] env: CARGO_TERM_COLOR: always jobs: build-realease: - runs-on: ubuntu-latest steps: @@ -21,3 +22,21 @@ jobs: with: name: schemsearch-cli path: target/release/schemsearch-cli + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build + run: cargo build --verbose --release + - name: Create Tarball + run: tar -czvf schemsearch-cli.tar.gz -C target/release schemsearch-cli + - name: upload linux artifact + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.published_release.outputs.upload_url }} + asset_path: schemsearch-cli.tar.gz + asset_name: schemsearch-cli-linux.tar.gz + asset_content_type: application/gzip diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml deleted file mode 100644 index 8841575..0000000 --- a/.github/workflows/release-build.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Release Build - -on: - release: - types: - - published - -env: - CARGO_TERM_COLOR: always - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build - run: cargo build --verbose --release - - name: Create Tarball - run: tar -czvf schemsearch-cli.tar.gz -C target/release schemsearch-cli - - name: upload linux artifact - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ steps.published_release.outputs.upload_url }} - asset_path: schemsearch-cli.tar.gz - asset_name: schemsearch-cli-linux.tar.gz - asset_content_type: application/gzip