diff --git a/.github/workflows/check_rust_quality.yml b/.github/workflows/check_rust_quality.yml index 10c8306..20f3c9b 100644 --- a/.github/workflows/check_rust_quality.yml +++ b/.github/workflows/check_rust_quality.yml @@ -5,7 +5,10 @@ on: branches: - dev workflow_call: - + inputs: + branch: + required: true + type: string env: CARGO_TERM_COLOR: always @@ -16,6 +19,11 @@ jobs: steps: - uses: actions/checkout@v2 + with: + ref: ${{ github.event.inputs.branch || 'dev' }} + + - name: Print branch + run: git branch - name: Check formatting run: ./scripts/format:check diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml index d942c60..38cfe13 100644 --- a/.github/workflows/on_release.yml +++ b/.github/workflows/on_release.yml @@ -10,12 +10,14 @@ env: jobs: - tests: - uses: cophilot/templify/.github/workflows/check_rust_quality.yml + quality-check: + uses: ./.github/workflows/check_rust_quality.yml + with: + branch: master + upload-release: runs-on: ubuntu-latest needs: [build-linux, build-windows, macos-linux] - steps: - uses: actions/checkout@v2 @@ -43,7 +45,7 @@ jobs: build-linux: runs-on: ubuntu-latest - + needs: [quality-check] steps: - uses: actions/checkout@v2 @@ -61,7 +63,7 @@ jobs: macos-linux: runs-on: macos-latest - + needs: [quality-check] steps: - uses: actions/checkout@v2 @@ -79,7 +81,7 @@ jobs: build-windows: runs-on: windows-latest - + needs: [quality-check] steps: - uses: actions/checkout@v2