Commit 961d996a authored by Johny Mattsson's avatar Johny Mattsson
Browse files

Name luac.cross artifacts better.

They don't need the target in there as the byte code is agnostic, but
it's marginally cleaner than letting the different builds overwrite the
artifacts.
parent 8f836932
...@@ -29,30 +29,37 @@ jobs: ...@@ -29,30 +29,37 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: ./install.sh run: ./install.sh
shell: bash shell: bash
- name: Build firmware (default configuration) - name: Prepare default sdkconfig
if: ${{ matrix.numbers == 'default' }}
run: | run: |
cp sdkconfig.defaults sdkconfig cp sdkconfig.defaults sdkconfig
make IDF_TARGET=${{ matrix.target }}
shell: bash shell: bash
- name: Build firmware (Lua 5.1, integer-only) - name: Update config for Lua 5.1, integer-only
if: ${{ matrix.lua_ver == '5.1' && matrix.numbers == 'alternate' }} if: ${{ matrix.lua_ver == '5.1' && matrix.numbers == 'alternate' }}
run: | run: |
cp sdkconfig.defaults sdkconfig
echo CONFIG_LUA_NUMBER_INTEGRAL=y >> sdkconfig echo CONFIG_LUA_NUMBER_INTEGRAL=y >> sdkconfig
make IDF_TARGET=${{ matrix.target }}
shell: bash shell: bash
- name: Build firmware (Lua 5.3, 64bit int/double) - name: Update config for Lua 5.3
if: ${{ matrix.lua_ver == '5.3' }}
run: |
echo CONFIG_LUA_VERSION_53=y >> sdkconfig
shell: bash
- name: Update config for Lua 5.3, 64bit numbers
if: ${{ matrix.lua_ver == '5.3' && matrix.numbers == 'alternate' }} if: ${{ matrix.lua_ver == '5.3' && matrix.numbers == 'alternate' }}
run: | run: |
cp sdkconfig.defaults sdkconfig
echo CONFIG_LUA_NUMBER_INT64=y >> sdkconfig echo CONFIG_LUA_NUMBER_INT64=y >> sdkconfig
echo CONFIG_LUA_NUMBER_DOUBLE=y >> sdkconfig echo CONFIG_LUA_NUMBER_DOUBLE=y >> sdkconfig
shell: bash
- name: Build firmware
run: |
make IDF_TARGET=${{ matrix.target }} make IDF_TARGET=${{ matrix.target }}
shell: bash shell: bash
- name: Get Lua build options
run: |
echo lua_build_opts="$(expr "$(./build/luac_cross/luac.cross -v)" : '.*\[\(.*\)\]')" >> $GITHUB_ENV
shell: bash
- name: Upload luac.cross - name: Upload luac.cross
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: ${{ success() }} if: ${{ success() }}
with: with:
name: luac.cross-${{ matrix.lua_ver }}-${{ matrix.numbers }}-${{ matrix.target }} name: luac.cross-${{ env.lua_build_opts }}-${{ matrix.target }}
path: build/luac_cross/luac.cross path: build/luac_cross/luac.cross
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment