From 0d5c43685d84c94211916ddeb98050d3480b9ef7 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 24 Oct 2023 04:29:37 +0000 Subject: [PATCH] JikesRVM's Rust project needs files that are generated in the building process. Try use cargo generate-lockfile for JikesRVM --- .github/workflows/auto-merge-inner.yml | 5 ----- .github/workflows/auto-merge.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/auto-merge-inner.yml b/.github/workflows/auto-merge-inner.yml index 1c5005192d..75be7642ac 100644 --- a/.github/workflows/auto-merge-inner.yml +++ b/.github/workflows/auto-merge-inner.yml @@ -68,11 +68,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Setup - if: steps.check-input.outputs.skip == 'false' - working-directory: ${{ env.BINDING_WORK_DIR }} - run: | - .github/scripts/ci-setup.sh - name: Update mmtk dependency if: steps.check-input.outputs.skip == 'false' working-directory: ${{ env.MMTK_CORE_WORK_DIR }} diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 5cd5b459f3..ddb2d6ef5a 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -48,7 +48,7 @@ jobs: base_repo: mmtk/mmtk-jikesrvm ref: ${{ needs.binding-refs.outputs.jikesrvm_binding_ref }} core_commit: ${{ needs.get-merged-pr.outputs.commit }} - update_lockfile: cargo build --features nogc --target i686-unknown-linux-gnu + update_lockfile: cargo generate-lockfile secrets: inherit check-merge-v8-pr: