Fixed workflow to generate an o2r instead

This commit is contained in:
KiritoDv 2025-01-15 11:51:41 -06:00
parent 06340f65fa
commit d6c2bc323e

View File

@ -8,7 +8,7 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
generate-port-otr: generate-port-o2r:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -19,32 +19,32 @@ jobs:
- name: ccache - name: ccache
uses: hendrikmuhs/ccache-action@v1.2.13 uses: hendrikmuhs/ccache-action@v1.2.13
with: with:
key: ${{ runner.os }}-otr-ccache-${{ github.ref }}-${{ github.sha }} key: ${{ runner.os }}-o2r-ccache-${{ github.ref }}-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-otr-ccache-${{ github.ref }} ${{ runner.os }}-o2r-ccache-${{ github.ref }}
${{ runner.os }}-otr-ccache- ${{ runner.os }}-o2r-ccache-
- name: Cache build folders - name: Cache build folders
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
key: ${{ runner.os }}-otr-build-${{ github.ref }}-${{ github.sha }} key: ${{ runner.os }}-o2r-build-${{ github.ref }}-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-otr-build-${{ github.ref }} ${{ runner.os }}-o2r-build-${{ github.ref }}
${{ runner.os }}-otr-build- ${{ runner.os }}-o2r-build-
path: | path: |
tools/Torch/cmake-build-release tools/Torch/cmake-build-release
- name: Generate starship.otr - name: Generate starship.o2r
run: | run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
make -C tools/Torch type=release -j3 make -C tools/Torch type=release -j3
tools/Torch/cmake-build-release/torch pack port starship.otr tools/Torch/cmake-build-release/torch pack port starship.o2r o2r
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: starship.otr name: starship.o2r
path: starship.otr path: starship.o2r
retention-days: 1 retention-days: 1
build-windows: build-windows:
needs: generate-port-otr needs: generate-port-o2r
runs-on: windows-2022 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -54,11 +54,11 @@ jobs:
run: | run: |
cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64 -DCMAKE_BUILD_TYPE=Release cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64 -DCMAKE_BUILD_TYPE=Release
cmake --build ./build/x64 --config Release --parallel 10 cmake --build ./build/x64 --config Release --parallel 10
- name: Download starship.otr - name: Download starship.o2r
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: starship.otr name: starship.o2r
path: ./build/x64/Release/starship.otr path: ./build/x64/Release/starship.o2r
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
@ -66,7 +66,7 @@ jobs:
path: ./build/x64/Release path: ./build/x64/Release
build-macos: build-macos:
needs: generate-port-otr needs: generate-port-o2r
runs-on: macOS-latest runs-on: macOS-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -78,16 +78,16 @@ jobs:
run: | run: |
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
cmake --build build-cmake --config Release -j3 cmake --build build-cmake --config Release -j3
- name: Download starship.otr - name: Download starship.o2r
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: starship.otr name: starship.o2r
path: build-cmake/starship.otr path: build-cmake/starship.o2r
- name: Create Package - name: Create Package
run: | run: |
mkdir starship-release mkdir starship-release
mv build-cmake/Starship starship-release/ mv build-cmake/Starship starship-release/
mv build-cmake/starship.otr starship-release/ mv build-cmake/starship.o2r starship-release/
- name: Publish packaged artifacts - name: Publish packaged artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
@ -95,7 +95,7 @@ jobs:
path: starship-release path: starship-release
build-linux: build-linux:
needs: generate-port-otr needs: generate-port-o2r
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -123,11 +123,11 @@ jobs:
cmake .. cmake ..
make make
sudo make install sudo make install
- name: Download starship.otr - name: Download starship.o2r
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: starship.otr name: starship.o2r
path: build-cmake/starship.otr path: build-cmake/starship.o2r
- name: Build - name: Build
run: | run: |
cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release