Skip to content

Commit

Permalink
Remove unused seba tags in build process
Browse files Browse the repository at this point in the history
  • Loading branch information
andreas-el committed Feb 28, 2024
1 parent df828a9 commit e107cf4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/bundle_with_dakota_caller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ env:
NO_PROJECT_RES: 1
BOOST_VERSION: 1.84.0
DAKOTA_VERSION: 6.19.0
SEBA_TAG: 7.3.1
INSTALL_DIR: local
NEEDS_REBUILD: true

Expand All @@ -29,7 +28,6 @@ jobs:
NO_PROJECT_RES: ${{ env.NO_PROJECT_RES }}
BOOST_VERSION: ${{ env.BOOST_VERSION }}
DAKOTA_VERSION: ${{ env.DAKOTA_VERSION }}
SEBA_TAG: ${{ env.SEBA_TAG }}
INSTALL_DIR: ${{ env.INSTALL_DIR }}
NEEDS_REBUILD: ${{ env.NEEDS_REBUILD }}

Expand All @@ -38,7 +36,7 @@ jobs:
name: Check cache for already built wheels
id: cache-package
with:
key: carolina_wheels_boost${{ env.BOOST_VERSION }}_dakota${{ env.DAKOTA_VERSION }}_seba${{ env.SEBA_TAG }}
key: carolina_wheels_boost${{ env.BOOST_VERSION }}_dakota${{ env.DAKOTA_VERSION }}
path: /tmp/dist
- name: Write cache status to outputs
if: steps.cache-package.outputs.cache-hit == 'true'
Expand All @@ -54,7 +52,6 @@ jobs:
NO_PROJECT_RES: ${{ needs.build-settings.outputs.NO_PROJECT_RES}}
BOOST_VERSION: ${{ needs.build-settings.outputs.BOOST_VERSION}}
DAKOTA_VERSION: ${{ needs.build-settings.outputs.DAKOTA_VERSION}}
SEBA_TAG: ${{ needs.build-settings.outputs.SEBA_TAG}}
INSTALL_DIR: ${{ needs.build-settings.outputs.INSTALL_DIR}}
secrets: inherit

Expand All @@ -67,7 +64,6 @@ jobs:
NO_PROJECT_RES: ${{ needs.build-settings.outputs.NO_PROJECT_RES}}
BOOST_VERSION: ${{ needs.build-settings.outputs.BOOST_VERSION}}
DAKOTA_VERSION: ${{ needs.build-settings.outputs.DAKOTA_VERSION}}
SEBA_TAG: ${{ needs.build-settings.outputs.SEBA_TAG}}
INSTALL_DIR: ${{ needs.build-settings.outputs.INSTALL_DIR}}
secrets: inherit

Expand All @@ -91,12 +87,12 @@ jobs:
uses: actions/cache/save@v3
with:
path: dist
key: carolina_wheels_boost${{ needs.build-settings.outputs.BOOST_VERSION }}_dakota${{ needs.build-settings.outputs.DAKOTA_VERSION }}_seba${{ needs.build-settings.outputs.SEBA_TAG }}
key: carolina_wheels_boost${{ needs.build-settings.outputs.BOOST_VERSION }}_dakota${{ needs.build-settings.outputs.DAKOTA_VERSION }}

- uses: actions/cache/restore@v3
id: restore-cached-package
with:
key: carolina_wheels_boost${{ needs.build-settings.outputs.BOOST_VERSION }}_dakota${{ needs.build-settings.outputs.DAKOTA_VERSION }}_seba${{ needs.build-settings.outputs.SEBA_TAG }}
key: carolina_wheels_boost${{ needs.build-settings.outputs.BOOST_VERSION }}_dakota${{ needs.build-settings.outputs.DAKOTA_VERSION }}
path: dist

- name: Validate dist with twine check
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/bundle_with_dakota_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ on:
INSTALL_DIR:
required: true
type: string
SEBA_TAG:
required: true
type: string

jobs:
build_wheels:
Expand All @@ -44,7 +41,7 @@ jobs:
- uses: actions/cache@v3
id: cache-package-check
with:
key: carolina_dist_${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}_seba-${{ inputs.SEBA_TAG }}
key: carolina_dist_${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}
path: ./carolina_dist

- uses: actions/checkout@v3
Expand All @@ -67,7 +64,7 @@ jobs:
if: steps.cache-package-check.outputs.cache-hit != 'true'
id: cache-package-store
with:
key: carolina_dist_${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}_seba-${{ inputs.SEBA_TAG }}
key: carolina_dist_${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}
path: ./carolina_dist

- name: Checkout Carolina
Expand All @@ -80,7 +77,7 @@ jobs:
uses: actions/cache@v3
id: restore-cached-package
with:
key: carolina_dist_${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}_seba-${{ inputs.SEBA_TAG }}
key: carolina_dist_${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}
path: ./carolina_dist

- name: Set up Python ${{ matrix.python-version }}
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/bundle_with_dakota_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ on:
INSTALL_DIR:
required: true
type: string
SEBA_TAG:
required: true
type: string

jobs:
build_dependencies:
Expand All @@ -47,7 +44,6 @@ jobs:
echo "inputs.BOOST_VERSION=${{ inputs.BOOST_VERSION }}"
echo "inputs.DAKOTA_VERSION=${{ inputs.DAKOTA_VERSION }}"
echo "inputs.INSTALL_DIR=${{ inputs.INSTALL_DIR }}"
echo "inputs.SEBA_TAG=${{ inputs.SEBA_TAG }}"
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -97,7 +93,7 @@ jobs:
- uses: actions/cache@v3
id: cache-package
with:
key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}_seba-${{ inputs.SEBA_TAG }}
key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}
path: ${{ github.workspace }}/python-${{ matrix.python-version}}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}.tar.gz

- name: Install dependencies
Expand Down Expand Up @@ -209,12 +205,12 @@ jobs:
uses: actions/cache/save@v3
with:
path: ${{ github.workspace }}/python-${{ matrix.python-version}}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}.tar.gz
key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}_seba-${{ inputs.SEBA_TAG }}
key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}

- uses: actions/cache/restore@v3
id: restore-cached-package
with:
key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}_seba-${{ inputs.SEBA_TAG }}
key: ${{ matrix.os }}_python-${{ matrix.python-version }}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}
path: ${{ github.workspace }}/python-${{ matrix.python-version}}_boost-${{ inputs.BOOST_VERSION }}_dakota-${{ inputs.DAKOTA_VERSION }}.tar.gz

- name: Unpack boost + dakota
Expand Down

0 comments on commit e107cf4

Please sign in to comment.