From 112fe7bddd1a5f288f4d8d1b6bfde623f57db7d2 Mon Sep 17 00:00:00 2001 From: Takase <20792268+takase1121@users.noreply.github.com> Date: Sat, 8 Apr 2023 01:24:27 +0800 Subject: [PATCH] fix(CI): bump dependency versions (#1434) * refactor(ci): use microsoft/setup-msbuild * fix(ci): fix wrong option name for setup-msbuild * fix(ci): bump setup-python version * fix(lua-utf8-patch): enable support for windows vista and above * fix(ci): use vs backend * fix(ci): reconfigure project manually after patch * fix(ci): add a separate build step * fix(ci): use msvc-dev-cmd again --- .github/workflows/build.yml | 33 ++++++++++++++++++--------------- .github/workflows/release.yml | 12 ++++++------ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fb880ff..a3cbb2a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,9 +30,9 @@ jobs: echo "$HOME/.local/bin" >> "$GITHUB_PATH" echo "INSTALL_REF=${GITHUB_REF##*/}" >> "$GITHUB_ENV" echo "INSTALL_NAME=lite-xl-${GITHUB_REF##*/}-linux-$(uname -m)-portable" >> "$GITHUB_ENV" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Python Setup - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Update Packages @@ -47,7 +47,7 @@ jobs: if: ${{ matrix.config.cc == 'gcc' }} run: bash scripts/package.sh --version ${INSTALL_REF} --debug --binary - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ matrix.config.cc == 'gcc' }} with: name: Linux Artifacts @@ -71,9 +71,9 @@ jobs: echo "$HOME/.local/bin" >> "$GITHUB_PATH" echo "INSTALL_REF=${GITHUB_REF##*/}" >> "$GITHUB_ENV" echo "INSTALL_NAME=lite-xl-${GITHUB_REF##*/}-macos-$(uname -m)" >> "$GITHUB_ENV" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Python Setup - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install Dependencies @@ -85,7 +85,7 @@ jobs: - name: Create DMG Image run: bash scripts/package.sh --version ${INSTALL_REF} --debug --dmg - name: Upload DMG Image - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: macOS DMG Image path: ${{ env.INSTALL_NAME }}.dmg @@ -100,7 +100,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }} @@ -127,7 +127,7 @@ jobs: - name: Package run: bash scripts/package.sh --version ${INSTALL_REF} --debug --binary - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Windows Artifacts path: ${{ env.INSTALL_NAME }}.zip @@ -137,20 +137,22 @@ jobs: runs-on: windows-2019 strategy: matrix: - arch: [amd64, amd64_x86] + arch: + - { target: x86, name: i686 } + - { target: x64, name: x86_64 } steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1 with: - arch: ${{ matrix.arch }} - - uses: actions/setup-python@v1 + arch: ${{ matrix.arch.target }} + - uses: actions/setup-python@v2 with: python-version: '3.x' - name: Install meson and ninja run: pip install meson ninja - name: Set up environment variables run: | - "INSTALL_NAME=lite-xl-$($env:GITHUB_REF -replace ".*/")-windows-msvc-${{ matrix.arch }}" >> $env:GITHUB_ENV + "INSTALL_NAME=lite-xl-$($env:GITHUB_REF -replace ".*/")-windows-msvc-${{ matrix.arch.name }}" >> $env:GITHUB_ENV "INSTALL_REF=$($env:GITHUB_REF -replace ".*/")" >> $env:GITHUB_ENV "LUA_SUBPROJECT_PATH=subprojects/lua-5.4.4" >> $env:GITHUB_ENV - name: Configure @@ -158,13 +160,14 @@ jobs: meson setup --wrap-mode=forcefallback build Get-Content -Path resources/windows/001-lua-unicode.diff -Raw | patch -d $env:LUA_SUBPROJECT_PATH -p1 --forward - name: Build - run: meson install -C build --destdir="../lite-xl" + run: | + meson install -C build --destdir="../lite-xl" - name: Package run: | Remove-Item -Recurse -Force -Path "lite-xl/lib","lite-xl/include" Compress-Archive -Path lite-xl -DestinationPath "$env:INSTALL_NAME.zip" - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Windows Artifacts (MSVC) path: ${{ env.INSTALL_NAME }}.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea0e1848..47b826dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: version: ${{ steps.tag.outputs.version }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Fetch Version id: tag run: | @@ -58,9 +58,9 @@ jobs: run: | echo "$HOME/.local/bin" >> "$GITHUB_PATH" echo "INSTALL_REF=${{ needs.release.outputs.version }}" >> "$GITHUB_ENV" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Python Setup - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Update Packages @@ -115,9 +115,9 @@ jobs: echo "INSTALL_REF=${{ needs.release.outputs.version }}" >> "$GITHUB_ENV" echo "INSTALL_NAME=lite-xl-${{ needs.release.outputs.version }}-macos-${{ matrix.arch }}" >> "$GITHUB_ENV" echo "INSTALL_NAME_ADDONS=lite-xl-${{ needs.release.outputs.version }}-addons-macos-${{ matrix.arch }}" >> "$GITHUB_ENV" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Python Setup - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Install Dependencies @@ -150,7 +150,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }}