Skip to content

Commit

Permalink
restore install target; remove build_ock ninja_run param
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-forbes-cp committed Nov 15, 2024
1 parent a558499 commit edceb44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions .github/actions/do_build_ock/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ inputs:
toolchain_file:
description: "Path to toolchain file"
default: ""
ninja_run:
description: "Run ninja command"
default: "true"

runs:
# We don't want a new docker just a list of steps, so mark as composite
Expand Down Expand Up @@ -168,7 +165,6 @@ runs:
${{ inputs.extra_flags }}
.
- name: build_ock
if: ${{ inputs.ninja_run == 'true' }}
shell: ${{ inputs.shell_to_use }}
run:
ninja -C ${{ inputs.build_dir }} ${{ inputs.build_targets }}
4 changes: 2 additions & 2 deletions .github/workflows/run_pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ jobs:
# Based on a combination of: mr-ubuntu-gcc-x86_64-clik
# and: mr-ubuntu-gcc-x86_64-clik-refsi
run-ubuntu-gcc-x86_64-clik-refsi:
if: false
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -429,8 +430,7 @@ jobs:
- name: build ock
uses: ./.github/actions/do_build_ock
with:
# build_targets: install # build install to catch any compilation errors
ninja_run: false
build_targets: install
mux_targets_enable: riscv
external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi
mux_compilers_enable: refsi_g1_wi
Expand Down

0 comments on commit edceb44

Please sign in to comment.