From 23c0ad60f5c3502fbff2659fe5e978e09926993a Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Wed, 2 Jul 2025 12:53:02 -0700 Subject: [PATCH 1/3] feat(ci): add GitHub merge workflow This adds a workflow that should run when a PR is added to the merge queue. The workflow has all the same jobs that run to deploy pages. This is step 1 of a full fix; step two is to deploy using the same GitHub actions instead of the deploy.sh script. --- .github/workflows/merge.yml | 217 ++++++++++++++++++++++++++++++++++ .github/workflows/regress.yml | 3 - 2 files changed, 217 insertions(+), 3 deletions(-) create mode 100755 .github/workflows/merge.yml diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100755 index 000000000..258f780a0 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,217 @@ +name: Merge Queue Tests +permissions: + contents: read + pull-requests: write +on: + merge_group: + types: [checks_requested] + workflow_dispatch: +jobs: + build-reuse-manifest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - name: run reuse + run: ./bin/reuse spdx + build-udb-api-doc: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate UDB API Docs + run: ./do gen:udb:api_doc + build-isa-explorer-csr: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate ISA Explorer CSR + run: ./do gen:isa_explorer_browser_csr + build-isa-explorer-ext: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate ISA Explorer Extension + run: ./do gen:isa_explorer_browser_ext + build-isa-explorer-inst: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate ISA Explorer Instructions + run: ./do gen:isa_explorer_browser_insts + build-isa-explorer-spreadsheet: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate ISA Explorer Spreadsheet + run: ./do gen:isa_explorer_browser_spreadsheet + build-html-isa-manual: + runs-on: ubuntu-latest + env: + MANUAL_NAME: isa + VERSIONS: all + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate HTML ISA manual + run: ./do gen:html_manual + build-html-cfg-isa-manual: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate HTML ISA manual for a config + run: ./do gen:html[example_rv64_with_overlay] + build-instruction-appendix: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate instruction appendix + run: ./do gen:instruction_appendix + build-rvi20-profile: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate RVI20 + run: ./do gen:profile_release_pdf[RVI20] + build-rva20-profile: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate RVA20 + run: ./do gen:profile_release_pdf[RVA20] + build-rva22-profile: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate RVA22 + run: ./do gen:profile_release_pdf[RVA22] + build-rva23-profile: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate RVA23 + run: ./do gen:profile_release_pdf[RVA23] + build-rvb23-profile: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate RVB23 + run: ./do gen:profile_release_pdf[RVB23] + build-ac100-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate AC100 CRD + run: ./do gen:proc_crd_pdf[AC100] + build-ac200-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate AC200 CRD + run: ./do gen:proc_crd_pdf[AC200] + build-mc100-32-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC100-32 CRD + run: ./do gen:proc_crd_pdf[MC100-32] + build-mc100-64-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC100-64 CRD + run: ./do gen:proc_crd_pdf[MC100-64] + build-mc200-32-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC200-32 CRD + run: ./do gen:proc_crd_pdf[MC200-32] + build-mc200-64-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC200-64 CRD + run: ./do gen:proc_crd_pdf[MC200-64] + build-mc300-32-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC300-32 CRD + run: ./do gen:proc_crd_pdf[MC300-32] + build-mc300-64-crd: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC300-64 CRD + run: ./do gen:proc_crd_pdf[MC300-64] + build-mc100-32-ctp: + runs-on: ubuntu-latest + steps: + - name: Clone Github Repo Action + uses: actions/checkout@v4 + - name: singularity setup + uses: ./.github/actions/singularity-setup + - name: Generate MC100-32 CTP + run: ./do gen:proc_ctp_pdf[MC100-32] diff --git a/.github/workflows/regress.yml b/.github/workflows/regress.yml index 5feba5e98..8ad3475ec 100755 --- a/.github/workflows/regress.yml +++ b/.github/workflows/regress.yml @@ -3,9 +3,6 @@ permissions: contents: read pull-requests: write on: - push: - branches: - - main merge_group: types: [checks_requested] pull_request: From 4c4a231add1c21b846c425f33d6fac9384eb411e Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Fri, 11 Jul 2025 08:42:33 -0700 Subject: [PATCH 2/3] fix: need to specify the container type in merge action --- .github/workflows/merge.yml | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 258f780a0..5ade30fc9 100755 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -9,6 +9,8 @@ on: jobs: build-reuse-manifest: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -16,6 +18,8 @@ jobs: run: ./bin/reuse spdx build-udb-api-doc: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -25,6 +29,8 @@ jobs: run: ./do gen:udb:api_doc build-isa-explorer-csr: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -34,6 +40,8 @@ jobs: run: ./do gen:isa_explorer_browser_csr build-isa-explorer-ext: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -43,6 +51,8 @@ jobs: run: ./do gen:isa_explorer_browser_ext build-isa-explorer-inst: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -52,6 +62,8 @@ jobs: run: ./do gen:isa_explorer_browser_insts build-isa-explorer-spreadsheet: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -62,6 +74,7 @@ jobs: build-html-isa-manual: runs-on: ubuntu-latest env: + SINGULARITY: 1 MANUAL_NAME: isa VERSIONS: all steps: @@ -73,6 +86,8 @@ jobs: run: ./do gen:html_manual build-html-cfg-isa-manual: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -82,6 +97,8 @@ jobs: run: ./do gen:html[example_rv64_with_overlay] build-instruction-appendix: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -91,6 +108,8 @@ jobs: run: ./do gen:instruction_appendix build-rvi20-profile: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -100,6 +119,8 @@ jobs: run: ./do gen:profile_release_pdf[RVI20] build-rva20-profile: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -109,6 +130,8 @@ jobs: run: ./do gen:profile_release_pdf[RVA20] build-rva22-profile: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -118,6 +141,8 @@ jobs: run: ./do gen:profile_release_pdf[RVA22] build-rva23-profile: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -127,6 +152,8 @@ jobs: run: ./do gen:profile_release_pdf[RVA23] build-rvb23-profile: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -136,6 +163,8 @@ jobs: run: ./do gen:profile_release_pdf[RVB23] build-ac100-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -145,6 +174,8 @@ jobs: run: ./do gen:proc_crd_pdf[AC100] build-ac200-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -154,6 +185,8 @@ jobs: run: ./do gen:proc_crd_pdf[AC200] build-mc100-32-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -163,6 +196,8 @@ jobs: run: ./do gen:proc_crd_pdf[MC100-32] build-mc100-64-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -172,6 +207,8 @@ jobs: run: ./do gen:proc_crd_pdf[MC100-64] build-mc200-32-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -181,6 +218,8 @@ jobs: run: ./do gen:proc_crd_pdf[MC200-32] build-mc200-64-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -190,6 +229,8 @@ jobs: run: ./do gen:proc_crd_pdf[MC200-64] build-mc300-32-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -199,6 +240,8 @@ jobs: run: ./do gen:proc_crd_pdf[MC300-32] build-mc300-64-crd: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -208,6 +251,8 @@ jobs: run: ./do gen:proc_crd_pdf[MC300-64] build-mc100-32-ctp: runs-on: ubuntu-latest + env: + SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 From c511e0c6c6e16c61809fe595a295b4fd93584f5b Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Mon, 14 Jul 2025 08:13:12 -0700 Subject: [PATCH 3/3] refactor(ci): make singularity env setting global in merge workflow --- .github/workflows/merge.yml | 48 +++---------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 5ade30fc9..59a81b07e 100755 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -6,11 +6,12 @@ on: merge_group: types: [checks_requested] workflow_dispatch: +env: + SINGULARITY: 1 jobs: build-reuse-manifest: runs-on: ubuntu-latest - env: - SINGULARITY: 1 + steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -18,8 +19,6 @@ jobs: run: ./bin/reuse spdx build-udb-api-doc: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -29,8 +28,6 @@ jobs: run: ./do gen:udb:api_doc build-isa-explorer-csr: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -40,8 +37,6 @@ jobs: run: ./do gen:isa_explorer_browser_csr build-isa-explorer-ext: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -51,8 +46,6 @@ jobs: run: ./do gen:isa_explorer_browser_ext build-isa-explorer-inst: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -62,8 +55,6 @@ jobs: run: ./do gen:isa_explorer_browser_insts build-isa-explorer-spreadsheet: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -74,7 +65,6 @@ jobs: build-html-isa-manual: runs-on: ubuntu-latest env: - SINGULARITY: 1 MANUAL_NAME: isa VERSIONS: all steps: @@ -86,8 +76,6 @@ jobs: run: ./do gen:html_manual build-html-cfg-isa-manual: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -97,8 +85,6 @@ jobs: run: ./do gen:html[example_rv64_with_overlay] build-instruction-appendix: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -108,8 +94,6 @@ jobs: run: ./do gen:instruction_appendix build-rvi20-profile: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -119,8 +103,6 @@ jobs: run: ./do gen:profile_release_pdf[RVI20] build-rva20-profile: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -130,8 +112,6 @@ jobs: run: ./do gen:profile_release_pdf[RVA20] build-rva22-profile: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -141,8 +121,6 @@ jobs: run: ./do gen:profile_release_pdf[RVA22] build-rva23-profile: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -152,8 +130,6 @@ jobs: run: ./do gen:profile_release_pdf[RVA23] build-rvb23-profile: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -163,8 +139,6 @@ jobs: run: ./do gen:profile_release_pdf[RVB23] build-ac100-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -174,8 +148,6 @@ jobs: run: ./do gen:proc_crd_pdf[AC100] build-ac200-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -185,8 +157,6 @@ jobs: run: ./do gen:proc_crd_pdf[AC200] build-mc100-32-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -196,8 +166,6 @@ jobs: run: ./do gen:proc_crd_pdf[MC100-32] build-mc100-64-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -207,8 +175,6 @@ jobs: run: ./do gen:proc_crd_pdf[MC100-64] build-mc200-32-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -218,8 +184,6 @@ jobs: run: ./do gen:proc_crd_pdf[MC200-32] build-mc200-64-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -229,8 +193,6 @@ jobs: run: ./do gen:proc_crd_pdf[MC200-64] build-mc300-32-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -240,8 +202,6 @@ jobs: run: ./do gen:proc_crd_pdf[MC300-32] build-mc300-64-crd: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4 @@ -251,8 +211,6 @@ jobs: run: ./do gen:proc_crd_pdf[MC300-64] build-mc100-32-ctp: runs-on: ubuntu-latest - env: - SINGULARITY: 1 steps: - name: Clone Github Repo Action uses: actions/checkout@v4