Skip to content

Commit 093a568

Browse files
committed
Fix issues with native image binary build
- DeLaGuardo/setup-graalvm -> graalvm/setup-graalvm - Remove 'release-binary-artifacts' since this is done from the 'release' workflow
1 parent 6686877 commit 093a568

File tree

1 file changed

+14
-46
lines changed

1 file changed

+14
-46
lines changed

.github/workflows/native-image.yaml

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
runs-on: ${{ matrix.os }}
2222
needs: setup-xml-version
2323
env:
24-
GRAALVM_VERSION: 22.0.0.2
25-
GRAALVM_JAVA: java17
24+
GRAALVM_VERSION: 22.3.3
25+
GRAALVM_JAVA: 17
2626
strategy:
2727
fail-fast: true
2828
matrix:
@@ -51,15 +51,15 @@
5151
uses: actions/cache@v2
5252
with:
5353
path: |
54-
/opt/hostedtoolcache/GraalVM
55-
~/hostedtoolcache/GraalVM
54+
/opt/hostedtoolcache/graalvm-ce-*
55+
~/hostedtoolcache/graalvm-ce-*
5656
key: ${{ runner.os }}-graalvm-${{env.GRAALVM_VERSION}}
5757
restore-keys: |
5858
${{ runner.os }}-graalvm-
59-
- uses: DeLaGuardo/setup-graalvm@48f2bf339ab7d35e31029b1822a213681fdfc42e #v5.0
59+
- uses: graalvm/setup-graalvm@0e29e36dce77b07eb899abac809c2fce9d60c140 #v1.1.3.1
6060
with:
61-
graalvm: ${{env.GRAALVM_VERSION}}
62-
java: ${{env.GRAALVM_JAVA}}
61+
version: ${{env.GRAALVM_VERSION}}
62+
java-version: ${{env.GRAALVM_JAVA}}
6363
- run: ./mvnw -B package -Dnative -DskipTests $([ $(uname -s) = Linux ] && echo "-Dgraalvm.static=-H:+StaticExecutableWithDynamicLibC") -Dcbi.jarsigner.skip=true
6464
- run: rm org.eclipse.lemminx/target/*.build_artifacts.txt
6565
- run: mv org.eclipse.lemminx/target/lemminx-* lemminx-${{ matrix.label }}
@@ -72,8 +72,8 @@
7272
runs-on: windows-latest
7373
needs: setup-xml-version
7474
env:
75-
GRAALVM_VERSION: 22.0.0.2
76-
GRAALVM_JAVA: java17
75+
GRAALVM_VERSION: 22.3.3
76+
GRAALVM_JAVA: 17
7777
steps:
7878
- name: Check out LemMinX
7979
uses: actions/checkout@v2
@@ -94,51 +94,19 @@
9494
uses: actions/cache@v2
9595
with:
9696
path: |
97-
C:\hostedtoolcache\windows\GraalVM
97+
C:\hostedtoolcache\windows\graalvm-ce-*
9898
key: ${{ runner.os }}-graalvm-${{env.GRAALVM_VERSION}}
9999
restore-keys: |
100100
${{ runner.os }}-graalvm-
101101
- uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d #v1.12.0
102-
- uses: DeLaGuardo/setup-graalvm@48f2bf339ab7d35e31029b1822a213681fdfc42e #v5.0
102+
- uses: graalvm/setup-graalvm@0e29e36dce77b07eb899abac809c2fce9d60c140 #v1.1.3.1
103103
with:
104-
graalvm: ${{env.GRAALVM_VERSION}}
105-
java: ${{env.GRAALVM_JAVA}}
104+
version: ${{env.GRAALVM_VERSION}}
105+
java-version: ${{env.GRAALVM_JAVA}}
106106
- run: .\mvnw.cmd -B package -Dnative -DskipTests -D "cbi.jarsigner.skip=true"
107107
- run: mv org.eclipse.lemminx\target\lemminx-*.exe lemminx-win32.exe
108108
- uses: actions/upload-artifact@v3
109109
with:
110110
name: lemminx-win32
111111
path: lemminx-win32.exe
112-
if-no-files-found: error
113-
release-binary-artifacts:
114-
needs: [build-binary-unix, build-binary-windows]
115-
runs-on: ubuntu-latest
116-
steps:
117-
- uses: actions/checkout@v2
118-
with:
119-
repository: 'eclipse/lemminx'
120-
fetch-depth: 2
121-
- run: git rev-parse HEAD^ > lastCommit
122-
- name: Check New Changes To LS
123-
id: cache-last-commit
124-
uses: actions/cache@v2
125-
with:
126-
path: lastCommit
127-
key: lastCommit-${{ hashFiles('lastCommit') }}
128-
- name: Retrieve Binary Artifacts
129-
if: steps.cache-last-commit.outputs.cache-hit != 'true'
130-
uses: actions/download-artifact@v3
131-
- name: Prepare Binary Artifacts
132-
if: steps.cache-last-commit.outputs.cache-hit != 'true'
133-
run: for f in lemminx-linux lemminx-osx-x86_64 lemminx-win32; do pushd ${f} && chmod u+x ${f}* && zip ../${f}.zip ${f}* && sha256sum ${f}* > ../${f}.sha256 && popd; done
134-
- name: Release Binary Artifacts
135-
if: steps.cache-last-commit.outputs.cache-hit != 'true'
136-
uses: marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0 #v1.2.1
137-
with:
138-
repo_token: "${{ secrets.GITHUB_TOKEN }}"
139-
automatic_release_tag: "latest"
140-
prerelease: true
141-
title: "Development Build"
142-
files: |
143-
lemminx-*.zip
144-
lemminx-*.sha256
112+
if-no-files-found: error

0 commit comments

Comments
 (0)