Skip to content

Commit af0059a

Browse files
authored
Merge pull request #2798 from matklad/release-process
Tweak release workflow
2 parents 3924c7d + 7e1a25f commit af0059a

File tree

2 files changed

+15
-45
lines changed

2 files changed

+15
-45
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
RUN_SLOW_TESTS: 1
2121
RUSTUP_MAX_RETRIES: 10
2222
CARGO_NET_RETRY: 10
23-
PROFILE: debug
2423
steps:
2524

2625
- name: Checkout repository
@@ -76,7 +75,7 @@ jobs:
7675

7776
- name: Prepare cache 2
7877
if: matrix.os == 'windows-latest'
79-
run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe
78+
run: Remove-Item ./target/debug/xtask.exe
8079

8180
type-script:
8281
name: TypeScript

.github/workflows/release.yaml

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: CI-Release
22
on:
3-
pull_request:
43
push:
54
branches:
6-
- master
5+
- release
76

87
jobs:
98
rust:
@@ -15,10 +14,8 @@ jobs:
1514
env:
1615
RUSTFLAGS: -D warnings
1716
CARGO_INCREMENTAL: 0
18-
RUN_SLOW_TESTS: 1
1917
RUSTUP_MAX_RETRIES: 10
2018
CARGO_NET_RETRY: 10
21-
PROFILE: release
2219
steps:
2320

2421
- name: Checkout repository
@@ -40,47 +37,26 @@ jobs:
4037
override: true
4138
components: rustfmt, rust-src
4239

43-
- name: Cache cargo registry
44-
uses: actions/cache@v1
45-
with:
46-
path: ~/.cargo/registry
47-
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
48-
49-
- name: Cache cargo index
50-
uses: actions/cache@v1
51-
with:
52-
path: ~/.cargo/git
53-
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
54-
55-
- name: Cache cargo target dir
56-
uses: actions/cache@v1
57-
with:
58-
path: target
59-
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
60-
61-
- name: Compile and Test
40+
- name: Build
6241
uses: actions-rs/cargo@v1
6342
with:
64-
command: test
65-
args: --release --all-targets
43+
command: build
44+
args: --release --package ra_lsp_server --bin ra_lsp_server
6645

67-
- name: Prepare cache
68-
run: cargo xtask pre-cache
46+
- name: Strip symbols
47+
if: matrix.os == 'ubuntu-latest'
48+
run: strip ./target/release/ra_lsp_server
6949

70-
- name: Prepare cache 2
71-
if: matrix.os == 'windows-latest'
72-
run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe
73-
74-
- name: Creat distribution dir
50+
- name: Create distribution dir
7551
run: mkdir ./dist
7652

77-
- name: Copy binaries (non-win)
53+
- name: Copy binaries (unix)
7854
if: matrix.os != 'windows-latest'
79-
run: cp ./target/${{ env.PROFILE }}/ra_lsp_server ./dist
55+
run: cp ./target/release/ra_lsp_server ./dist
8056

8157
- name: Copy binaries (win)
8258
if: matrix.os == 'windows-latest'
83-
run: copy ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist
59+
run: copy ./target/release/ra_lsp_server.exe ./dist
8460

8561
- name: Upload artifacts
8662
uses: actions/upload-artifact@v1
@@ -91,9 +67,6 @@ jobs:
9167
type-script:
9268
name: TypeScript
9369
runs-on: ubuntu-latest
94-
env:
95-
CXX: g++-4.9
96-
CC: gcc-4.9
9770
steps:
9871
- name: Checkout repository
9972
uses: actions/checkout@v1
@@ -105,20 +78,18 @@ jobs:
10578

10679
- run: npm ci
10780
working-directory: ./editors/code
81+
10882
- run: npm run package --scripts-prepend-node-path
10983
working-directory: ./editors/code
11084

111-
- name: Create distribution directory
112-
run: mkdir ./dist
113-
11485
- name: Copy vscode extension
115-
run: mkdir ./dist/code && cp ./editors/code/*.vsix ./dist/code/
86+
run: mkdir -p ./dist/code && cp ./editors/code/*.vsix ./dist/code/
11687

11788
- name: Copy emacs mode
11889
run: cp -R ./editors/emacs ./dist/
11990

12091
- name: Upload artifacts
12192
uses: actions/upload-artifact@v1
12293
with:
123-
name: editors
94+
name: editor-plugins
12495
path: ./dist

0 commit comments

Comments
 (0)