fix node.js warning

update run_gettext.bat to use own tools
This commit is contained in:
SoftFever 2024-03-10 22:45:35 +08:00
parent 2efba59b0d
commit 20477bcc40
7 changed files with 24 additions and 22 deletions

View file

@ -23,7 +23,7 @@ jobs:
valid-cache: ${{ steps.cache_deps.outputs.cache-hit }} valid-cache: ${{ steps.cache_deps.outputs.cache-hit }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: set outputs - name: set outputs
id: set_outputs id: set_outputs
@ -38,7 +38,7 @@ jobs:
- name: load cache - name: load cache
id: cache_deps id: cache_deps
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ${{ steps.set_outputs.outputs.cache-path }} path: ${{ steps.set_outputs.outputs.cache-path }}
key: ${{ steps.set_outputs.outputs.cache-key }} key: ${{ steps.set_outputs.outputs.cache-key }}

View file

@ -31,17 +31,17 @@ jobs:
# Setup the environment # Setup the environment
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: load cached deps - name: load cached deps
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ${{ inputs.cache-path }} path: ${{ inputs.cache-path }}
key: ${{ inputs.cache-key }} key: ${{ inputs.cache-key }}
- name: setup dev on Windows - name: setup dev on Windows
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: microsoft/setup-msbuild@v1.1 uses: microsoft/setup-msbuild@v2
- name: Get the date on Ubuntu and macOS - name: Get the date on Ubuntu and macOS
if: inputs.os != 'windows-latest' if: inputs.os != 'windows-latest'
@ -101,21 +101,21 @@ jobs:
# Upload Artifacts # Upload Artifacts
- name: Upload Mac ${{ inputs.arch }} artifacts - name: Upload Mac ${{ inputs.arch }} artifacts
if: inputs.os == 'macos-12' if: inputs.os == 'macos-12'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }} name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz
- name: Upload Windows artifacts - name: Upload Windows artifacts
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_dep_win64_${{ env.date }} name: OrcaSlicer_dep_win64_${{ env.date }}
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
- name: Upload Ubuntu artifacts - name: Upload Ubuntu artifacts
if: inputs.os == 'ubuntu-20.04' if: inputs.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_dep_ubuntu_${{ env.date }} name: OrcaSlicer_dep_ubuntu_${{ env.date }}
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz

View file

@ -25,10 +25,12 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with:
lfs: 'true'
- name: load cached deps - name: load cached deps
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ${{ inputs.cache-path }} path: ${{ inputs.cache-path }}
key: ${{ inputs.cache-key }} key: ${{ inputs.cache-key }}
@ -123,7 +125,7 @@ jobs:
- name: Upload artifacts mac - name: Upload artifacts mac
if: inputs.os == 'macos-12' if: inputs.os == 'macos-12'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }} name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
@ -142,7 +144,7 @@ jobs:
# Windows # Windows
- name: setup MSVC - name: setup MSVC
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: microsoft/setup-msbuild@v1.1 uses: microsoft/setup-msbuild@v2
- name: Install nsis - name: Install nsis
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
@ -175,21 +177,21 @@ jobs:
- name: Upload artifacts Win zip - name: Upload artifacts Win zip
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Windows_${{ env.ver }}_portable name: OrcaSlicer_Windows_${{ env.ver }}_portable
path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
- name: Upload artifacts Win installer - name: Upload artifacts Win installer
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Windows_${{ env.ver }} name: OrcaSlicer_Windows_${{ env.ver }}
path: ${{ github.workspace }}/build/OrcaSlicer*.exe path: ${{ github.workspace }}/build/OrcaSlicer*.exe
- name: Upload artifacts Win PDB - name: Upload artifacts Win PDB
if: inputs.os == 'windows-latest' if: inputs.os == 'windows-latest'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: PDB name: PDB
path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
@ -256,7 +258,7 @@ jobs:
- name: Upload artifacts Ubuntu - name: Upload artifacts Ubuntu
if: inputs.os == 'ubuntu-20.04' if: inputs.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: OrcaSlicer_Linux_${{ env.ver }} name: OrcaSlicer_Linux_${{ env.ver }}
path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage' path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage'

View file

@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install gettext - name: Install gettext
run: | run: |

View file

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
# download # download
- name: Download - name: Download

View file

@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
# 1. Clone the current wiki master branch to a folder named `tmp_wiki` # 1. Clone the current wiki master branch to a folder named `tmp_wiki`
- name: Pull content from wiki - name: Pull content from wiki

View file

@ -9,7 +9,7 @@ for %%a in (%*) do (
) )
if %FULL_MODE%==1 ( if %FULL_MODE%==1 (
./tools/xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot .\tools\xgettext.exe --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot
build\\src\\hints\\Release\\hintsToPot ./resources ./localization/i18n build\\src\\hints\\Release\\hintsToPot ./resources ./localization/i18n
) )
REM Print the current directory REM Print the current directory
@ -28,8 +28,8 @@ goto :eof
set "name=%~n1" set "name=%~n1"
set "lang=%name:OrcaSlicer_=%" set "lang=%name:OrcaSlicer_=%"
if %FULL_MODE%==1 ( if %FULL_MODE%==1 (
./tools/msgmerge -N -o "%file%" "%file%" "%pot_file%" .\tools\msgmerge.exe -N -o "%file%" "%file%" "%pot_file%"
) )
if not exist "./resources/i18n/%lang%" mkdir "./resources/i18n/%lang%" if not exist "./resources/i18n/%lang%" mkdir "./resources/i18n/%lang%"
./tools/msgfmt --check-format -o "./resources/i18n/%lang%/OrcaSlicer.mo" "%file%" .\tools\msgfmt.exe --check-format -o "./resources/i18n/%lang%/OrcaSlicer.mo" "%file%"
goto :eof goto :eof