diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index c113c45e4..bf9255175 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -5,12 +5,6 @@ on: branches: - 'main' -env: - pythonVersion: 3.9 - gudrunTag: 2022.4 - modexTag: 0.1.2 - hdf5tag: hdf5-1_10_7 - jobs: Lint: @@ -18,6 +12,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup + uses: "./.github/workflows/setup" - name: Lint uses: "./.github/workflows/lint" @@ -31,6 +27,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup + uses: "./.github/workflows/setup" - name: "Test (${{ matrix.os }})" uses: "./.github/workflows/test" @@ -44,8 +42,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Get Code Version - uses: "./.github/workflows/get-version" + - name: Setup + uses: "./.github/workflows/setup" - name: "Build (${{ matrix.os }})" uses: "./.github/workflows/build" - name: "Package (${{ matrix.os }})" @@ -57,8 +55,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Get Code Version - uses: "./.github/workflows/get-version" + - name: Setup + uses: "./.github/workflows/setup" - name: "Publish" uses: "./.github/workflows/publish" with: diff --git a/.github/workflows/get-version/action.yml b/.github/workflows/get-version/action.yml deleted file mode 100644 index 232acc7c0..000000000 --- a/.github/workflows/get-version/action.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Get Code Version - -runs: - using: "composite" - steps: - - - name: Grep Version - shell: bash - run: | - set -ex - GUDPY_VERSION=$(grep "VERSION =" gudpy.spec | sed "s/.*\"\(.*\)\"/\1/g") - echo "GudPy code version is ${GUDPY_VERSION}" - echo "gudPyVersion=${GUDPY_VERSION}" >> ${GITHUB_ENV} \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c5a74c7eb..ecf008222 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -5,12 +5,6 @@ on: branches: - '*' -env: - pythonVersion: 3.9 - gudrunTag: 2022.4 - modexTag: 0.1.2 - hdf5tag: hdf5-1_10_7 - jobs: Lint: @@ -18,6 +12,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup + uses: "./.github/workflows/setup" - name: Lint uses: "./.github/workflows/lint" @@ -31,6 +27,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup + uses: "./.github/workflows/setup" - name: "Test (${{ matrix.os }})" uses: "./.github/workflows/test" @@ -54,8 +52,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Get Code Version - uses: "./.github/workflows/get-version" + - name: Setup + uses: "./.github/workflows/setup" - name: "Build (${{ matrix.os }})" uses: "./.github/workflows/build" - name: "Package (${{ matrix.os }})" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ebcd12aa2..08ce723dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,12 +5,6 @@ on: branches: - 'release/*' -env: - pythonVersion: 3.9 - gudrunTag: 2022.4 - modexTag: 0.1.2 - hdf5tag: hdf5-1_10_7 - jobs: Lint: @@ -18,6 +12,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup + uses: "./.github/workflows/setup" - name: Lint uses: "./.github/workflows/lint" @@ -31,6 +27,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Setup + uses: "./.github/workflows/setup" - name: "Test (${{ matrix.os }})" uses: "./.github/workflows/test" @@ -44,8 +42,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Get Code Version - uses: "./.github/workflows/get-version" + - name: Setup + uses: "./.github/workflows/setup" - name: "Build (${{ matrix.os }})" uses: "./.github/workflows/build" - name: "Package (${{ matrix.os }})" @@ -57,8 +55,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Get Code Version - uses: "./.github/workflows/get-version" + - name: Setup + uses: "./.github/workflows/setup" - name: "Publish" uses: "./.github/workflows/publish" with: diff --git a/.github/workflows/setup/action.yml b/.github/workflows/setup/action.yml new file mode 100644 index 000000000..259dd6583 --- /dev/null +++ b/.github/workflows/setup/action.yml @@ -0,0 +1,41 @@ +name: Setup + +inputs: + pythonVersion: + type: string + default: 3.9 + gudrunTag: + type: string + default: 2022.4 + modexTag: + type: string + default: 0.1.2 + hdf5tag: + type: string + default: hdf5-1_10_7 + +runs: + using: "composite" + steps: + + - name: Set Environment + shell: bash + run: | + set -ex + echo "pythonVersion=${{ inputs.pythonVersion }}" >> ${GITHUB_ENV} + echo "gudrunTag=${{ inputs.gudrunTag }}" >> ${GITHUB_ENV} + echo "modexTag=${{ inputs.modexTag }}" >> ${GITHUB_ENV} + echo "hdf5tag=${{ inputs.hdf5tag }}" >> ${GITHUB_ENV} + + - name: Get GudPy Version + shell: bash + run: | + set -ex + GUDPY_VERSION=$(grep "VERSION =" gudpy.spec | sed "s/.*\"\(.*\)\"/\1/g") + echo "GudPy code version is ${GUDPY_VERSION}" + echo "gudPyVersion=${GUDPY_VERSION}" >> ${GITHUB_ENV} + + + + +