From f318662f56a067057dedaa8af4a5037556cf8938 Mon Sep 17 00:00:00 2001 From: zwiterrion Date: Fri, 9 Feb 2024 16:42:17 +0100 Subject: [PATCH 1/4] add script to pull extism libraries and maven plugin to include them in jar --- .github/workflows/ci.yaml | 2 ++ pom.xml | 5 +++++ src/main/resources/.gitkeep | 0 update-extism.sh | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 src/main/resources/.gitkeep create mode 100755 update-extism.sh diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5773502..83202fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,6 +20,8 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - uses: ./.github/actions/libextism + - name: fetch-extism-librairies + run: sh ./update-extism.sh - name: Set up Java uses: actions/setup-java@v3 with: diff --git a/pom.xml b/pom.xml index e2f78d4..e965d02 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,11 @@ + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + org.apache.maven.plugins maven-compiler-plugin diff --git a/src/main/resources/.gitkeep b/src/main/resources/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/update-extism.sh b/update-extism.sh new file mode 100755 index 0000000..4ebb70a --- /dev/null +++ b/update-extism.sh @@ -0,0 +1,34 @@ +EXTISM_VERSION=$(curl https://api.github.com/repos/extism/extism/releases/latest | jq -r '.name') + +echo "latest extism version is: ${EXTISM_VERSION}" + +rm -rf src/main/resources +mkdir -p ./src/main/resources/natives/ + +create_librairies_folders() { + declare -a archs=("darwin-aarch64" "darwin-x86-64" "linux-aarch64" "linux-x86-64" "win32-x86-64") + for i in "${archs[@]}" + do + mkdir ./src/main/resources/$i + done +} + +fetch_and_unzip_library() { + local ARCH="$1" + local LIBRARY_FOLDER="$2" + local FILENAME="$3" + + curl -L -o "./src/main/resources/natives/${ARCH}-${EXTISM_VERSION}.tar.gz" "https://github.com/extism/extism/releases/download/${EXTISM_VERSION}/${ARCH}-${EXTISM_VERSION}.tar.gz" + tar -xvf "./src/main/resources/natives/${ARCH}-${EXTISM_VERSION}.tar.gz" --directory ./src/main/resources/natives/ + mv ./src/main/resources/natives/${FILENAME} ./src/main/resources/${LIBRARY_FOLDER}/${FILENAME} +} + +create_librairies_folders + +fetch_and_unzip_library "libextism-aarch64-apple-darwin" "darwin-aarch64" "libextism.dylib" +fetch_and_unzip_library "libextism-x86_64-apple-darwin" "darwin-x86-64" "libextism.dylib" +fetch_and_unzip_library "libextism-aarch64-unknown-linux-gnu" "linux-aarch64" "libextism.so" +fetch_and_unzip_library "libextism-x86_64-unknown-linux-gnu" "linux-x86-64" "libextism.so" +fetch_and_unzip_library "libextism-x86_64-pc-windows-gnu" "win32-x86-64" "extism.dll" + +rm -rf src/main/resources/natives 2> /dev/null \ No newline at end of file From fb7699b4da884b3a61b246fa417e0225cfc571a3 Mon Sep 17 00:00:00 2001 From: zwiterrion Date: Sat, 10 Feb 2024 10:20:58 +0100 Subject: [PATCH 2/4] try to simplify syntax --- .DS_Store | Bin 0 -> 8196 bytes src/main/resources/.gitkeep | 0 update-extism.sh | 11 +++++------ 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 .DS_Store delete mode 100644 src/main/resources/.gitkeep diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7bb794bb942998f59fbba1234c10e48e5c9b7344 GIT binary patch literal 8196 zcmeHMU2GIp6h3Dt?VTwdx#g zSex`kO+eHai9Zj%Xd-HOFfn3$5Pj0b7fnM%BR;56AN56}(Rl8?vkfiu#RMf`ZgTIr z_sltW=6v&=nLV=rfT^O@1<(ipj5?QkEe$tm{5bD7G$qnhkwo$bup!KrgYm5EXK%2M z6)^%a0x<$H0x<$H0=EMK^v>pu&GX)uN8>R@AV%PhM1VgZ64bd&Msi9@@#vsIlmH}o z2_PEHsSXf6iAW|RIVGiVr9EZ!fRQUkB?d}&I-cO>B$JVxl2W<@N_W8M%otTDD9%oP z31JSHlrkP;1Y!hkM1ZGHHH2V70glh9-!EmyT_*@TJFlR!plV@t4Xa_b>`3~AUrvW+ zSPW8TVT`YaeBaGh=4SSwW0x~}eV^}zrsLTK;ow*{nH(N=Jj*Yq{Gw+C!Z$4sFqNqp zy>Vh!01r`i|2%Oc5X~= zQ0kN4B$VGPF@0HyN!4nN^pJLN#L4+y+Iig0=t~0%Y8Nf{73>lPGo16?V%`ffdR@+R zb4Aw-?OxaA#=%Hvp9=ZxP~aEBK4F;A^^a+5KcquFLpNgX5v&d%;1w5Rhz5 zCgr887Z)|GT-|!l{TnuKO%CkZGrf4pQoU}OrX3=5ywEx3*o6aS#|lr3nnBL?EXO-O zTyg>@>)Jz}nYZh(PF1J%B}*3@D~u+lx3ZC9)_JVxgr|j8Yc^J?`n&9~MHjQjxA=~h zv~M=nFgC{ZeFd9Fsn*sRcdNR|h5`yrZqcT-t9qagoupeRT|2Zcrd#R(*UZ|kRCQ~c znEsGDT#^w= zt;sftzCci|my4N^zmb|?4Rpg+*axFvK^dNb7vMa+4j18l_z*sY&*2JOg|Fai_#S?M zAK@qX1^$3P;V<|bYq1_1(7-i#AGYIq?7(i^h7V#AdvOO2;y&DuX&l8Y=FrAt=wTU8 z;RHT`PvW!q96pb);v0AY-@>=?J-mz`;m0_Q-{3X;7JtTHm4!-;!W31}l;ujJ(j>22 zspQ1)OdMjO@K9&vIpsw3oleQ$EGJq9c4#~Q*POVzNM^zE`i50JH8yQY&JajauEMhG z*((S;i{^r`;vUcCnz5p>Y2{s7%K>7veQLf0(`z_)*)+FaozPnJg~WNeT)U2z)x>wX zytl2TMOP@z5E2BvOU%#x`1FwAkFEX?hitv#5xGuUcM7? z^xu>80=xs4;4*whB)taT5jB59z-nAXlw5@gY{j*>j%eA58*rnb=5``x3j1(3?j>?Q zO!OSXBbdRXXyT*jVqQ@6w4mrDK7~)?89a;U@I1bVFX7Ah3cf~keRB>Gcg-duelVAa zrF6k_eeXEwE99N+60dF%0t@86jlBLJnE(6#EjoL=ZHz#S!0mtlR`sX*Q* Date: Sat, 10 Feb 2024 10:22:26 +0100 Subject: [PATCH 3/4] try to simplify syntax --- .DS_Store | Bin 8196 -> 0 bytes update-extism.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 7bb794bb942998f59fbba1234c10e48e5c9b7344..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIp6h3Dt?VTwdx#g zSex`kO+eHai9Zj%Xd-HOFfn3$5Pj0b7fnM%BR;56AN56}(Rl8?vkfiu#RMf`ZgTIr z_sltW=6v&=nLV=rfT^O@1<(ipj5?QkEe$tm{5bD7G$qnhkwo$bup!KrgYm5EXK%2M z6)^%a0x<$H0x<$H0=EMK^v>pu&GX)uN8>R@AV%PhM1VgZ64bd&Msi9@@#vsIlmH}o z2_PEHsSXf6iAW|RIVGiVr9EZ!fRQUkB?d}&I-cO>B$JVxl2W<@N_W8M%otTDD9%oP z31JSHlrkP;1Y!hkM1ZGHHH2V70glh9-!EmyT_*@TJFlR!plV@t4Xa_b>`3~AUrvW+ zSPW8TVT`YaeBaGh=4SSwW0x~}eV^}zrsLTK;ow*{nH(N=Jj*Yq{Gw+C!Z$4sFqNqp zy>Vh!01r`i|2%Oc5X~= zQ0kN4B$VGPF@0HyN!4nN^pJLN#L4+y+Iig0=t~0%Y8Nf{73>lPGo16?V%`ffdR@+R zb4Aw-?OxaA#=%Hvp9=ZxP~aEBK4F;A^^a+5KcquFLpNgX5v&d%;1w5Rhz5 zCgr887Z)|GT-|!l{TnuKO%CkZGrf4pQoU}OrX3=5ywEx3*o6aS#|lr3nnBL?EXO-O zTyg>@>)Jz}nYZh(PF1J%B}*3@D~u+lx3ZC9)_JVxgr|j8Yc^J?`n&9~MHjQjxA=~h zv~M=nFgC{ZeFd9Fsn*sRcdNR|h5`yrZqcT-t9qagoupeRT|2Zcrd#R(*UZ|kRCQ~c znEsGDT#^w= zt;sftzCci|my4N^zmb|?4Rpg+*axFvK^dNb7vMa+4j18l_z*sY&*2JOg|Fai_#S?M zAK@qX1^$3P;V<|bYq1_1(7-i#AGYIq?7(i^h7V#AdvOO2;y&DuX&l8Y=FrAt=wTU8 z;RHT`PvW!q96pb);v0AY-@>=?J-mz`;m0_Q-{3X;7JtTHm4!-;!W31}l;ujJ(j>22 zspQ1)OdMjO@K9&vIpsw3oleQ$EGJq9c4#~Q*POVzNM^zE`i50JH8yQY&JajauEMhG z*((S;i{^r`;vUcCnz5p>Y2{s7%K>7veQLf0(`z_)*)+FaozPnJg~WNeT)U2z)x>wX zytl2TMOP@z5E2BvOU%#x`1FwAkFEX?hitv#5xGuUcM7? z^xu>80=xs4;4*whB)taT5jB59z-nAXlw5@gY{j*>j%eA58*rnb=5``x3j1(3?j>?Q zO!OSXBbdRXXyT*jVqQ@6w4mrDK7~)?89a;U@I1bVFX7Ah3cf~keRB>Gcg-duelVAa zrF6k_eeXEwE99N+60dF%0t@86jlBLJnE(6#EjoL=ZHz#S!0mtlR`sX*Q* Date: Tue, 20 Feb 2024 09:44:42 +0100 Subject: [PATCH 4/4] add missing shebang --- update-extism.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/update-extism.sh b/update-extism.sh index 0b0cba1..9c37b86 100755 --- a/update-extism.sh +++ b/update-extism.sh @@ -1,3 +1,6 @@ +#!/bin/sh +set -e + EXTISM_VERSION=$(curl https://api.github.com/repos/extism/extism/releases/latest | jq -r '.name') echo "latest extism version is: ${EXTISM_VERSION}"