Skip to content

Commit d5628a3

Browse files
authored
Merge pull request #256 from galaxyproject/update_ci_actions
Update CI actions
2 parents 1b2be18 + 5217265 commit d5628a3

File tree

3 files changed

+44
-56
lines changed

3 files changed

+44
-56
lines changed

.github/workflows/client-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222
- name: Set up Python for local environment
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Install Node.js
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2828
with:
29-
node-version: 18
29+
node-version: 21
3030
- run: npm install
3131
- name: Run integration tests
3232
run: xvfb-run -a npm run test:e2e

.github/workflows/release.yml

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,38 @@ on:
1010

1111
jobs:
1212
prepare_release:
13-
name: Create Release
13+
name: Prepare Release
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Get version from tag
2020
id: get_version
21-
uses: battila7/get-version-action@v2
21+
uses: jannemattila/get-version-from-tag@v3
2222

23-
- name: Create Release
23+
- name: Setup Node.js
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: 21
27+
28+
- run: npm ci
29+
30+
- name: Package Extension
31+
id: packageExtension
32+
uses: HaaLeo/publish-vscode-extension@v1
33+
with:
34+
pat: stub
35+
packagePath: "./client/"
36+
dryRun: true
37+
38+
- name: Create Draf Release
2439
id: create_release
25-
uses: actions/create-release@v1
40+
uses: softprops/action-gh-release@v2
2641
env:
2742
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2843
with:
29-
tag_name: ${{ github.ref }}
30-
release_name: Release ${{ github.ref }}
44+
name: Release ${{ github.ref }}
3145
body: |
3246
This release contains the [Galaxy Language Server](https://github.com/davelopez/galaxy-language-server/tree/main/server) and the [Galaxy Tools Visual Studio Code Extension](https://github.com/davelopez/galaxy-language-server/tree/main/client).
3347
You can view the list of changes in the respective changelogs:
@@ -39,13 +53,16 @@ jobs:
3953
The Galaxy Tools Extension is available at [Open VSX Registry](https://open-vsx.org/extension/davelopez/galaxy-tools) and [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=davelopez.galaxy-tools).
4054
You can also install the extension manually by downloading the VSIX package included in this release and using:
4155
```
42-
code --install-extension galaxy-tools-${{ steps.get_version.outputs.version-without-v }}.vsix
56+
code --install-extension galaxy-tools-${{ steps.get_version.outputs.version }}.vsix
4357
```
44-
draft: false
58+
draft: true
4559
prerelease: false
60+
generate_release_notes: true
61+
files: ${{ steps.packageExtension.outputs.vsixPath }}
4662
outputs:
47-
release_version: ${{ steps.get_version.outputs.version-without-v }}
63+
release_version: ${{ steps.get_version.outputs.version }}
4864
release_upload_url: ${{ steps.create_release.outputs.upload_url }}
65+
vsixPath: ${{ steps.packageExtension.outputs.vsixPath }}
4966

5067
publish-server:
5168
name: Publish Language Server to PyPI
@@ -56,10 +73,10 @@ jobs:
5673
working-directory: server
5774
steps:
5875
- name: Checkout code
59-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
6077

6178
- name: Set up Python
62-
uses: actions/setup-python@v4
79+
uses: actions/setup-python@v5
6380
with:
6481
python-version: 3.8
6582

@@ -85,52 +102,23 @@ jobs:
85102
working-directory: client
86103
steps:
87104
- name: Checkout code
88-
uses: actions/checkout@v3
105+
uses: actions/checkout@v4
89106

90107
- name: Setup Node.js
91-
uses: actions/setup-node@v3
108+
uses: actions/setup-node@v4
92109
with:
93-
node-version: 16
94-
95-
- name: Clean install dependencies
96-
run: |
97-
npm ci
98-
99-
- name: Update version in package.json
100-
uses: onlyutkarsh/[email protected]
101-
with:
102-
files: "${{github.workspace}}/client/package.json"
103-
patch-syntax: |
104-
= /version => "${{needs.prepare_release.outputs.release_version}}"
105-
106-
- name: Publish to Open VSX Registry
107-
uses: HaaLeo/publish-vscode-extension@v1
108-
id: publishToOpenVSX
109-
with:
110-
pat: ${{ secrets.OPEN_VSX_TOKEN }}
111-
packagePath: "./client/"
110+
node-version: 21
112111

113112
- name: Publish to Visual Studio Marketplace
114113
uses: HaaLeo/publish-vscode-extension@v1
115114
with:
116115
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
117116
registryUrl: https://marketplace.visualstudio.com
118-
extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }}
119-
packagePath: ""
120-
121-
- name: Upload vsix as artifact
122-
uses: actions/upload-artifact@v3
123-
with:
124-
name: galaxy-tools-${{needs.prepare_release.outputs.release_version}}.vsix
125-
path: ${{ steps.publishToOpenVSX.outputs.vsixPath }}
117+
extensionFile: ${{ needs.prepare_release.outputs.vsixPath}}
126118

127-
- name: Upload Release Asset
128-
id: upload-release-asset
129-
uses: actions/upload-release-asset@v1
130-
env:
131-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
119+
- name: Publish to Open VSX Registry
120+
uses: HaaLeo/publish-vscode-extension@v1
121+
id: publishToOpenVSX
132122
with:
133-
upload_url: ${{ needs.prepare_release.outputs.release_upload_url }}
134-
asset_path: ${{ steps.publishToOpenVSX.outputs.vsixPath }}
135-
asset_name: galaxy-tools-${{needs.prepare_release.outputs.release_version}}.vsix
136-
asset_content_type: application/vsix
123+
pat: ${{ secrets.OPEN_VSX_TOKEN }}
124+
extensionFile: ${{ needs.prepare_release.outputs.vsixPath}}

.github/workflows/server-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
working-directory: server
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Python
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
- name: Install dependencies

0 commit comments

Comments
 (0)