diff options
| author | Adam <adamdharrison@gmail.com> | 2022-09-18 23:32:13 -0400 |
|---|---|---|
| committer | Adam <adamdharrison@gmail.com> | 2022-09-18 23:32:13 -0400 |
| commit | 51cdd7cb173467bccaca6295c9aed36f3efd96a5 (patch) | |
| tree | f66cb325de1ff18c97aa1017d25783508cca35c6 | |
| parent | 42b1f6d5125c4fe29e2b5fc4d82717ab43725080 (diff) | |
| download | lite-xl-plugin-manager-51cdd7cb173467bccaca6295c9aed36f3efd96a5.tar.gz lite-xl-plugin-manager-51cdd7cb173467bccaca6295c9aed36f3efd96a5.zip | |
Changed SSL build process, and changed how release works.
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rwxr-xr-x | build.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8ba198..0d7c466 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,5 +31,5 @@ jobs: env: { GITHUB_TOKEN: "${{ github.token }}" } run: | gh release delete -y continuous || true; gh release create -t 'Continuous Release' continuous *.zip *.tar.gz *.deb - [[ `git describe HEAD --tags` == "v"* ]] && gh release delete -y `git describe HEAD --tags` || true; - [[ `git describe HEAD --tags` == "v"* ]] && gh release create -t `git describe HEAD --tags` `git describe HEAD --tags` lpm.x86_64-linux lpm.x86_64-windows.exe + [[ `git describe HEAD --tags --match=v* | head -c 4` == "v"* ]] && gh release delete -y `git describe HEAD --tags --match=v* | head -c 4` || true; + [[ `git describe HEAD --tags --match=v* | head -c 4` == "v"* ]] && gh release create -t `git describe HEAD --tags --match=v* | head -c 4` `git describe HEAD --tags --match=v* | head -c 4` lpm.x86_64-linux lpm.x86_64-windows.exe @@ -18,7 +18,7 @@ if [[ "$@" != *"-lz"* ]]; then LDFLAGS="$LDFLAGS -Llib/libz/build -l:libz.a" && CFLAGS="$CFLAGS -Ilib/prefix/include" && LDFLAGS="$LDFLAGS -Llib/prefix/lib -Llib/prefix/lib64" fi if [[ "$@" != *"-lssl"* && "$@" != *"-lcrypto"* ]]; then - [ ! -e "lib/openssl/build" ] && cd lib/openssl && mkdir build && cd build && ../Configure --prefix=`pwd`/../../prefix $SSL_CONFIGURE && $MAKE -j $JOBS && $MAKE install && cd ../../../ && ln -sf lib/prefix/lib64/libcrypto.a lib/prefix/lib/libcyrpto.a + [ ! -e "lib/openssl/build" ] && cd lib/openssl && mkdir build && cd build && ../Configure --prefix=`pwd`/../../prefix $SSL_CONFIGURE && $MAKE -j $JOBS && $MAKE install_sw install_ssldirs && cd ../../../ && ln -sf lib/prefix/lib64/libcrypto.a lib/prefix/lib/libcyrpto.a LDFLAGS="$LDFLAGS -Llib/libz/build" && CFLAGS="$CFLAGS -Ilib/prefix/include" && LDFLAGS="$LDFLAGS -Llib/prefix/lib -Llib/prefix/lib64 -l:libssl.a -l:libcrypto.a" fi if [[ "$@" != *"-lgit2"* ]]; then |