From 24022d4d5c415403d2d8bb924bef8a69c45cebc2 Mon Sep 17 00:00:00 2001 From: rashtinjei <68064188+rashtinjei@users.noreply.github.com> Date: Fri, 7 Aug 2020 00:50:33 -0700 Subject: [PATCH 1/2] Create rust.yml --- .github/workflows/rust.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/rust.yml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml new file mode 100644 index 00000000..3c13d1be --- /dev/null +++ b/.github/workflows/rust.yml @@ -0,0 +1,22 @@ +name: Rust + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build + run: cargo build --verbose + - name: Run tests + run: cargo test --verbose From 75850545207e570df6f88c712a20e75625a193d0 Mon Sep 17 00:00:00 2001 From: rashtinjei <68064188+rashtinjei@users.noreply.github.com> Date: Fri, 7 Aug 2020 01:05:21 -0700 Subject: [PATCH 2/2] Update rust.yml --- .github/workflows/rust.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3c13d1be..e15ab82b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,3 +1,8 @@ + +git fetch origin +git checkout -b "rashtinjei-patch-1" "origin/rashtinjei-patch-1" +git merge "master" + name: Rust on: @@ -20,3 +25,7 @@ jobs: run: cargo build --verbose - name: Run tests run: cargo test --verbose + +git checkout "master" +git merge --no-ff "rashtinjei-patch-1" +git push origin "master"