diff --git a/.github/actions/setup/README.md b/.github/actions/setup/README.md deleted file mode 100644 index 0f65631af..000000000 --- a/.github/actions/setup/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# setup Action - -A custom setup action for starting an ldmx-sw workflow. - -After this action is run, further calls using the `ldmx` action can be done to use this compiled version of ldmx-sw to do things. - -The image used to compile ldmx-sw is stored in the `LDMX_DOCKER_TAG` environment variable. -This variable should be defined in the workflow or job that is using this action. - -We also checkout the golden histograms (`gold.root`) from `trunk` so this branch is compared against the most recent reference histograms. - -## Pre-requisites - -Whatever branch of ldmx-sw you want to `setup` must be already checked-out. - -```yaml - - uses: actions/checkout@v2 - with: - submodules: 'recursive' - ref: -``` diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml deleted file mode 100644 index c00b83bab..000000000 --- a/.github/actions/setup/action.yml +++ /dev/null @@ -1,10 +0,0 @@ - -name: setup -author: Tom Eichlersmith -description: Setup ldmx-sw and Compile the current version - -runs: - using: 'composite' - steps: - - run: bash ${GITHUB_ACTION_PATH}/setup.sh - shell: bash diff --git a/.github/actions/setup/setup.sh b/.github/actions/setup/setup.sh deleted file mode 100644 index ccf4c9c90..000000000 --- a/.github/actions/setup/setup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -e - -############################################################################### -# setup.sh -# Run the setup action. -# -# Assumptions -# - LDMX_DOCKER_TAG is defined to the image that should be used to compile -# - ldmx-sw is already checked out to the branch/tag to compile -# - $GITHUB_WORKSPACE is the ldmx-sw directory (default) -############################################################################### - -source ${GITHUB_ACTION_PATH}/../common.sh - -__main__() { - start_group Pull the Environment - docker pull ${LDMX_DOCKER_TAG} - docker inspect ${LDMX_DOCKER_TAG} - end_group - - start_group Configure the Build - local _build=${LDMX_BASE}/ldmx-sw/build - mkdir ${_build} - cd ${_build} - ldmx cmake .. || return $? - end_group - - start_group Build and Install - ldmx make install || return $? - end_group - - return 0 -} - -__main__ $@ diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f9fb49a1a..c1fa31e3c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,8 +30,16 @@ jobs: with: submodules: 'recursive' + - name : Install just + uses: extractions/setup-just@v2 + with: + just-version: 1.26.0 + - name: Compile and Install ldmx-sw - uses: ./.github/actions/setup + run: | + just install-denv init configure-force-error + just build + shell: bash # The rest of the steps are building docs # Since the build is made and tested above, diff --git a/.github/workflows/generate_pr_gold.yml b/.github/workflows/generate_pr_gold.yml index 34023fad9..d6e8bca6b 100644 --- a/.github/workflows/generate_pr_gold.yml +++ b/.github/workflows/generate_pr_gold.yml @@ -20,8 +20,16 @@ jobs: with: submodules: 'recursive' + - name : Install just + uses: extractions/setup-just@v2 + with: + just-version: 1.26.0 + - name: Compile and Install ldmx-sw - uses: ./.github/actions/setup + run: | + just install-denv init configure-force-error + just build + shell: bash - name: Package ldmx-sw Into Artifact run: tar cf ldmx-sw-package.tar install/ .github/ diff --git a/.github/workflows/new_pre_release.yml b/.github/workflows/new_pre_release.yml index b6506ebad..210e13bbd 100644 --- a/.github/workflows/new_pre_release.yml +++ b/.github/workflows/new_pre_release.yml @@ -28,8 +28,16 @@ jobs: submodules: 'recursive' ref: ${{ github.event.inputs.branch }} + - name : Install just + uses: extractions/setup-just@v2 + with: + just-version: 1.26.0 + - name: Compile and Install ldmx-sw - uses: ./.github/actions/setup + run: | + just install-denv init configure-force-error + just build + shell: bash - name: Package ldmx-sw Into Artifact run: tar cf ldmx-sw-package.tar install/ .github/