From 6fca2cc7d186da3bcee12260b5c4abe6aa1ea742 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Fri, 3 Mar 2023 07:06:59 +0700 Subject: [PATCH 1/4] commit changes --- .github/workflows/nightly.yml | 16 ++++++++++++++-- tools/createBinaryArchives.py | 7 ++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 03a9f93c..eb2ff6a7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -69,6 +69,18 @@ jobs: with: tag_name: "nightly" name: "${{ env.LTEX_LS_VERSION }}" - prerelease: true + prerelease: true body: "This is a nightly build. Use at your own risk." - files: "target/ltex-ls-${{ env.LTEX_LS_VERSION }}.tar.gz\ntarget/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x64.tar.gz\ntarget/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x64.tar.gz\ntarget/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x64.zip" + files: | + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x64.zip" + + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x86.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86.zip" + + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-arm64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-arm64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-arm64.zip" diff --git a/tools/createBinaryArchives.py b/tools/createBinaryArchives.py index f9e193c7..a802dee6 100644 --- a/tools/createBinaryArchives.py +++ b/tools/createBinaryArchives.py @@ -196,9 +196,10 @@ def getLtexLsVersion() -> str: def main() -> None: - createBinaryArchive("linux", "x64") - createBinaryArchive("mac", "x64") - createBinaryArchive("windows", "x64") + for arch in ["x64", "x32", "arm64"]: + createBinaryArchive("linux", arch) + createBinaryArchive("mac", arch) + createBinaryArchive("windows", arch) if __name__ == "__main__": From bc29be592cabc0184ec53539a56beb4972bee434 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Fri, 3 Mar 2023 07:19:17 +0700 Subject: [PATCH 2/4] update ci testing --- .github/workflows/ci.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4570ab64..ad937a34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -207,4 +207,16 @@ jobs: token: "${{ secrets.LTEX_LS_CREATE_GITHUB_RELEASE_TOKEN }}" prerelease: "${{ env.LTEX_LS_IS_PRERELEASE }}" body: "${{ env.LTEX_LS_CHANGELOG }}" - files: "target/ltex-ls-${{ env.LTEX_LS_VERSION }}.tar.gz\ntarget/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x64.tar.gz\ntarget/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x64.tar.gz\ntarget/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x64.zip" + files: | + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x64.zip" + + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x86.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86.zip" + + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-arm64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-arm64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-arm64.zip" From 776ee1dbf5d1738dc56b97a4ccf73e213995f455 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Fri, 3 Mar 2023 11:49:08 +0700 Subject: [PATCH 3/4] fix x86-32 arch --- .github/workflows/ci.yml | 6 +++--- .github/workflows/nightly.yml | 6 +++--- tools/createBinaryArchives.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad937a34..f8f7a9ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -213,9 +213,9 @@ jobs: "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x64.tar.gz" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x64.zip" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x86.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86.zip" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x86-32.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86-32.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86-32.zip" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-arm64.tar.gz" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-arm64.tar.gz" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index eb2ff6a7..e048d523 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -77,9 +77,9 @@ jobs: "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x64.tar.gz" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x64.zip" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x86.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86.zip" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-x86-32.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86-32.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86-32.zip" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-arm64.tar.gz" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-arm64.tar.gz" diff --git a/tools/createBinaryArchives.py b/tools/createBinaryArchives.py index a802dee6..bbe522ff 100644 --- a/tools/createBinaryArchives.py +++ b/tools/createBinaryArchives.py @@ -196,7 +196,7 @@ def getLtexLsVersion() -> str: def main() -> None: - for arch in ["x64", "x32", "arm64"]: + for arch in ["x64", "x86-32", "arm64"]: createBinaryArchive("linux", arch) createBinaryArchive("mac", arch) createBinaryArchive("windows", arch) From 797631d70a741063cba2089e3b5d66a2f5b4cdd7 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Thu, 16 Mar 2023 22:09:44 +0700 Subject: [PATCH 4/4] `arm64` -> `aarch64` --- .github/workflows/ci.yml | 6 +++--- .github/workflows/nightly.yml | 8 ++++---- tools/createBinaryArchives.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8f7a9ce..c80d7a98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -217,6 +217,6 @@ jobs: "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86-32.tar.gz" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86-32.zip" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-arm64.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-arm64.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-arm64.zip" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-aarch64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-aarch64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-aarch64.zip" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e048d523..c58304de 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -37,7 +37,7 @@ jobs: run: "echo \"LTEX_LS_VERSION=$(python -u -c \"import datetime; import re; print('{}.nightly.{}'.format(re.search(r'(.*?)(?:\\\\.develop)?', open('pom.xml', 'r').read()).group(1), datetime.datetime.today().strftime('%Y-%m-%d')), end='')\")\" >> $GITHUB_ENV" - name: "Check LTEX_LS_VERSION" - run: "if [[ -z \"$LTEX_LS_VERSION\" ]]; then echo 'Error: LTEX_LS_VERSION not set!'; (exit 1); fi; echo \"LTEX_LS_VERSION set to '$LTEX_LS_VERSION'\"" + run: 'if [[ -z "$LTEX_LS_VERSION" ]]; then echo ''Error: LTEX_LS_VERSION not set!''; (exit 1); fi; echo "LTEX_LS_VERSION set to ''$LTEX_LS_VERSION''"' - name: "Bump Version" run: "python -u -c \"import re\nfile = open('pom.xml', 'r+'); pom = file.read(); file.seek(0); file.truncate(); file.write(re.sub(r'(.*?)', '${{ env.LTEX_LS_VERSION }}', pom, 1))\"" @@ -81,6 +81,6 @@ jobs: "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-x86-32.tar.gz" "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-x86-32.zip" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-arm64.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-arm64.tar.gz" - "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-arm64.zip" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-linux-aarch64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-mac-aarch64.tar.gz" + "target/ltex-ls-${{ env.LTEX_LS_VERSION }}-windows-aarch64.zip" diff --git a/tools/createBinaryArchives.py b/tools/createBinaryArchives.py index bbe522ff..efd25716 100644 --- a/tools/createBinaryArchives.py +++ b/tools/createBinaryArchives.py @@ -196,7 +196,7 @@ def getLtexLsVersion() -> str: def main() -> None: - for arch in ["x64", "x86-32", "arm64"]: + for arch in ["x64", "x86-32", "aarch64"]: createBinaryArchive("linux", arch) createBinaryArchive("mac", arch) createBinaryArchive("windows", arch)