From 22a0c9a838b2010cdab4f3de14162be383730a09 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Fri, 3 Jan 2020 18:24:58 +0000 Subject: Make artifacts accessible --- .github/workflows/ci.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e7e0d599e..8602b8502 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -97,3 +97,10 @@ jobs: working-directory: ./editors/code - run: npm run package --scripts-prepend-node-path working-directory: ./editors/code + + - name: Upload artifacts + uses: actions/upload-artifact@v1 + with: + name: ubuntu-editors + path: /home/runner/work/rust-analyzer/editors + -- cgit v1.2.3 From dd998d90764467b978dc3a65b574feb83ea5e5ef Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Fri, 3 Jan 2020 21:52:15 +0000 Subject: noop --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8602b8502..7b4a597a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -104,3 +104,4 @@ jobs: name: ubuntu-editors path: /home/runner/work/rust-analyzer/editors + -- cgit v1.2.3 From 79e1cb9b5962fd4369c5d72af0f04c2be61158fc Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Wed, 8 Jan 2020 12:31:05 +0000 Subject: Upload --- .github/workflows/ci.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7b4a597a8..b4a334813 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -77,6 +77,11 @@ jobs: if: matrix.os == 'windows-latest' run: Remove-Item ./target/debug/xtask.exe + - name: Upload artifacts + uses: actions/upload-artifact@v1 + with: + name: editors + path: ./target/release type-script: name: TypeScript @@ -101,7 +106,5 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v1 with: - name: ubuntu-editors + name: editors path: /home/runner/work/rust-analyzer/editors - - -- cgit v1.2.3 From f9049d35a27b6e199b8e0d78218cff7dc131e96a Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Wed, 8 Jan 2020 12:36:02 +0000 Subject: Relative adderss --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b4a334813..7b46671c9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -107,4 +107,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: editors - path: /home/runner/work/rust-analyzer/editors + path: ./editors -- cgit v1.2.3 From dd5e1b652ff7f6c560e8a486401e84d57a463597 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 08:56:42 +0000 Subject: Less output for typescript artifacts --- .github/workflows/ci.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7b46671c9..0376fd28c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -103,8 +103,13 @@ jobs: - run: npm run package --scripts-prepend-node-path working-directory: ./editors/code + - name: Remove files not to be published + run: mkdir ./dist + run: cp ./editors/code/*.vsix ./dist/code/ + run: cp -R ./editors/emacs ./dist/ + - name: Upload artifacts uses: actions/upload-artifact@v1 with: - name: editors - path: ./editors + name: executables + path: ./dist -- cgit v1.2.3 From cbd0baf20be0077e8c2791a6a292df561d2b6c80 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 13:18:16 +0000 Subject: Getting to grips with github format... --- .github/workflows/ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0376fd28c..fa8e47210 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -103,9 +103,13 @@ jobs: - run: npm run package --scripts-prepend-node-path working-directory: ./editors/code - - name: Remove files not to be published + - name: Create distribution directory run: mkdir ./dist + + - name: Copy vscode extension run: cp ./editors/code/*.vsix ./dist/code/ + + - name: Copy emacs mode run: cp -R ./editors/emacs ./dist/ - name: Upload artifacts -- cgit v1.2.3 From 5d43ce12c38596a9c2bef70ece9d878487432cf3 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 13:24:20 +0000 Subject: put as debug for now while I get it working. --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa8e47210..2b022a862 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -80,8 +80,8 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v1 with: - name: editors - path: ./target/release + name: executables + path: ./target/debug type-script: name: TypeScript @@ -115,5 +115,5 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v1 with: - name: executables + name: editors path: ./dist -- cgit v1.2.3 From 6fecdd3ccf1ac8cdc70a8b1942855a136e323c75 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 13:35:54 +0000 Subject: create dir if not there as cp doesn't seem to have an option to create the dest dir automatically. --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2b022a862..8f2a48ece 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -107,7 +107,7 @@ jobs: run: mkdir ./dist - name: Copy vscode extension - run: cp ./editors/code/*.vsix ./dist/code/ + run: mkdir ./dist/code && cp ./editors/code/*.vsix ./dist/code/ - name: Copy emacs mode run: cp -R ./editors/emacs ./dist/ -- cgit v1.2.3 From f562a1fc9f41ca162cf9253c2845204c8d9a0cee Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 19:21:08 +0000 Subject: Packaging server bins --- .github/workflows/ci.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8f2a48ece..e1a4800db 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -77,11 +77,22 @@ jobs: if: matrix.os == 'windows-latest' run: Remove-Item ./target/debug/xtask.exe + - name: Creat distribution dir + run: mkdir ./dist + + - name: Copy binaries (non-win) + if: matrix.os != 'windows-latest' + run: cp ./target/debug/ra-lsp-server.* ./dist + + - name: Copy binaries (win) + if: matrix.os == 'windows-latest' + run: copy ./target/debug/ra-lsp-server.* ./dist + - name: Upload artifacts uses: actions/upload-artifact@v1 with: - name: executables - path: ./target/debug + name: executables-${{ matrix.os }} + path: ./dist type-script: name: TypeScript -- cgit v1.2.3 From 3422bf1d29e83ae6f813cda65f835a861fb3807e Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 19:36:12 +0000 Subject: parameterised debug --- .github/workflows/ci.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e1a4800db..793fb428a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,6 +20,7 @@ jobs: RUN_SLOW_TESTS: 1 RUSTUP_MAX_RETRIES: 10 CARGO_NET_RETRY: 10 + PROFILE: debug steps: - name: Checkout repository @@ -75,18 +76,18 @@ jobs: - name: Prepare cache 2 if: matrix.os == 'windows-latest' - run: Remove-Item ./target/debug/xtask.exe + run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe - name: Creat distribution dir run: mkdir ./dist - name: Copy binaries (non-win) if: matrix.os != 'windows-latest' - run: cp ./target/debug/ra-lsp-server.* ./dist + run: cp ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist - name: Copy binaries (win) if: matrix.os == 'windows-latest' - run: copy ./target/debug/ra-lsp-server.* ./dist + run: copy ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist - name: Upload artifacts uses: actions/upload-artifact@v1 -- cgit v1.2.3 From 45b0e7ad7d7b747632ec574a360227cf78d121d4 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 19:45:26 +0000 Subject: second attempt --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 793fb428a..eab03f581 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -83,7 +83,7 @@ jobs: - name: Copy binaries (non-win) if: matrix.os != 'windows-latest' - run: cp ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist + run: cp ./target/${{ env.PROFILE }}/ra_lsp_server* ./dist - name: Copy binaries (win) if: matrix.os == 'windows-latest' -- cgit v1.2.3 From 973aa054ee0fe229786415de2d46bba195f6c148 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 20:21:07 +0000 Subject: Split out into a release build as bins were not getting generated as cargo build wasn't run --- .github/workflows/ci.yaml | 32 ---------- .github/workflows/release.yaml | 131 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/release.yaml (limited to '.github') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eab03f581..3a2bdb4a6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -78,23 +78,6 @@ jobs: if: matrix.os == 'windows-latest' run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe - - name: Creat distribution dir - run: mkdir ./dist - - - name: Copy binaries (non-win) - if: matrix.os != 'windows-latest' - run: cp ./target/${{ env.PROFILE }}/ra_lsp_server* ./dist - - - name: Copy binaries (win) - if: matrix.os == 'windows-latest' - run: copy ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist - - - name: Upload artifacts - uses: actions/upload-artifact@v1 - with: - name: executables-${{ matrix.os }} - path: ./dist - type-script: name: TypeScript runs-on: ubuntu-latest @@ -114,18 +97,3 @@ jobs: working-directory: ./editors/code - run: npm run package --scripts-prepend-node-path working-directory: ./editors/code - - - name: Create distribution directory - run: mkdir ./dist - - - name: Copy vscode extension - run: mkdir ./dist/code && cp ./editors/code/*.vsix ./dist/code/ - - - name: Copy emacs mode - run: cp -R ./editors/emacs ./dist/ - - - name: Upload artifacts - uses: actions/upload-artifact@v1 - with: - name: editors - path: ./dist diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 000000000..278f5a586 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,131 @@ +name: CI +on: + pull_request: + push: + branches: + - master + - staging + - trying + +jobs: + rust: + name: Rust + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + env: + RUSTFLAGS: -D warnings + CARGO_INCREMENTAL: 0 + RUN_SLOW_TESTS: 1 + RUSTUP_MAX_RETRIES: 10 + CARGO_NET_RETRY: 10 + PROFILE: release + steps: + + - name: Checkout repository + uses: actions/checkout@v1 + + # We need to disable the existing toolchain to avoid updating rust-docs + # which takes a long time. The fastest way to do this is to rename the + # existing folder, as deleting it takes about as much time as not doing + # anything and just updating rust-docs. + - name: Rename existing rust toolchain (Windows) + if: matrix.os == 'windows-latest' + run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + profile: minimal + override: true + components: rustfmt, rust-src + + - name: Cache cargo registry + uses: actions/cache@v1 + with: + path: ~/.cargo/registry + key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} + + - name: Cache cargo index + uses: actions/cache@v1 + with: + path: ~/.cargo/git + key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} + + - name: Cache cargo target dir + uses: actions/cache@v1 + with: + path: target + key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} + + - name: Compile + uses: actions-rs/cargo@v1 + with: + command: build + args: --release + + - name: Test + uses: actions-rs/cargo@v1 + with: + command: test + + - name: Prepare cache + run: cargo xtask pre-cache + + - name: Prepare cache 2 + if: matrix.os == 'windows-latest' + run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe + + - name: Creat distribution dir + run: mkdir ./dist + + - name: Copy binaries (non-win) + if: matrix.os != 'windows-latest' + run: cp ./target/${{ env.PROFILE }}/ra_lsp_server* ./dist + + - name: Copy binaries (win) + if: matrix.os == 'windows-latest' + run: copy ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist + + - name: Upload artifacts + uses: actions/upload-artifact@v1 + with: + name: executables-${{ matrix.os }} + path: ./dist + + type-script: + name: TypeScript + runs-on: ubuntu-latest + env: + CXX: g++-4.9 + CC: gcc-4.9 + steps: + - name: Checkout repository + uses: actions/checkout@v1 + + - name: Install Nodejs + uses: actions/setup-node@v1 + with: + node-version: 12.x + + - run: npm ci + working-directory: ./editors/code + - run: npm run package --scripts-prepend-node-path + working-directory: ./editors/code + + - name: Create distribution directory + run: mkdir ./dist + + - name: Copy vscode extension + run: mkdir ./dist/code && cp ./editors/code/*.vsix ./dist/code/ + + - name: Copy emacs mode + run: cp -R ./editors/emacs ./dist/ + + - name: Upload artifacts + uses: actions/upload-artifact@v1 + with: + name: editors + path: ./dist -- cgit v1.2.3 From 477668fc223136064f8af48af1125380f98bfc65 Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 20:38:26 +0000 Subject: Was doing the compile twice. --- .github/workflows/release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 278f5a586..75c2f41ae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,4 +1,4 @@ -name: CI +name: CI-Release on: pull_request: push: @@ -70,6 +70,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: test + args: --release - name: Prepare cache run: cargo xtask pre-cache -- cgit v1.2.3 From f1920d7b54b89432e9d8f210fdc56c82ed8e805d Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 21:11:52 +0000 Subject: Still double compiling. Try this. --- .github/workflows/release.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to '.github') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 75c2f41ae..3d45413e1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -60,17 +60,11 @@ jobs: path: target key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - - name: Compile - uses: actions-rs/cargo@v1 - with: - command: build - args: --release - - - name: Test + - name: Compile and Test uses: actions-rs/cargo@v1 with: command: test - args: --release + args: --release --all-targets - name: Prepare cache run: cargo xtask pre-cache @@ -93,7 +87,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v1 with: - name: executables-${{ matrix.os }} + name: server-${{ matrix.os }} path: ./dist type-script: -- cgit v1.2.3 From 42942fc66215b1bc63817e679b2fd7e18579b78f Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 22:11:25 +0000 Subject: Reducing binary size and optimising a bit more. --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3d45413e1..eff68a95c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,7 +78,7 @@ jobs: - name: Copy binaries (non-win) if: matrix.os != 'windows-latest' - run: cp ./target/${{ env.PROFILE }}/ra_lsp_server* ./dist + run: cp ./target/${{ env.PROFILE }}/ra_lsp_server ./dist - name: Copy binaries (win) if: matrix.os == 'windows-latest' -- cgit v1.2.3 From 2187732fb5a4c9ae79a93b01cf82ec87f3750f9f Mon Sep 17 00:00:00 2001 From: Giles Cope Date: Thu, 9 Jan 2020 22:13:50 +0000 Subject: We only want this triggering for master. --- .github/workflows/release.yaml | 2 -- 1 file changed, 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eff68a95c..6cb27482d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,8 +4,6 @@ on: push: branches: - master - - staging - - trying jobs: rust: -- cgit v1.2.3