Skip to content

Commit

Permalink
Switch from bmad-external-deps to bmad-external-packages. (#1066)
Browse files Browse the repository at this point in the history
* Switch from bmad-external-deps to bmad-external-packages.
  • Loading branch information
DavidSagan committed Jul 16, 2024
1 parent 926a5fe commit d97b1d2
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 21 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ on:
## types:
## - "published"

# Configuration for the version of external dependencies
# Configuration for the version of external packages
# We do this so we can cache them and avoid checking out that big
# repository at all times.

env:
EXTERNAL_DEPS_VERSION: main
EXTERNAL_PACKAGES_VERSION: main

#
jobs:
Expand Down Expand Up @@ -60,16 +60,17 @@ jobs:
# libcairo2-dev libpango1.0-dev libxt-dev libx11-dev -y

# In case we don't have it available, check it out
- name: Checkout External Dependencies
- name: Checkout External Packages
run: |
git clone --depth 1 --branch ${{ env.EXTERNAL_DEPS_VERSION }} https://github.com/bmad-sim/bmad-external-deps.git ~/external_deps
git clone --depth 1 --branch ${{ env.EXTERNAL_PACKAGES_VERSION }} https://github.com/bmad-sim/bmad-external-packages.git ~/external_packages
#
- name: Extract dependencies
- name: Move External Packages
run: |
for dep in ~/external_deps/*.tar.gz; \
do \
tar xzvf $dep -C $GITHUB_WORKSPACE/; \
for dep in ~/external_packages/*; \
do if [ $dep != "README.md" ]; \
then cp -r $dep $GITHUB_WORKSPACE/; \
fi; \
done
#
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
# Run on manual trigger
workflow_dispatch:

# Configuration for the version of external dependencies
# Configuration for the version of external packages
# We do this so we can cache them and avoid checking out that big
# repository at all times.
env:
EXTERNAL_DEPS_VERSION: main
EXTERNAL_PACKAGES_VERSION: main

permissions:
contents: write
Expand Down Expand Up @@ -44,16 +44,17 @@ jobs:
# sudo apt-get install gfortran g++ cmake libtool-bin libreadline-dev libpango1.0-dev libssl-dev bc

# In case we don't have it available, check it out
- name: Checkout External Dependencies
- name: Checkout External Packages
run: |
git clone --depth 1 --branch ${{ env.EXTERNAL_DEPS_VERSION }} https://github.com/bmad-sim/bmad-external-deps.git ~/external_deps
git clone --depth 1 --branch ${{ env.EXTERNAL_PACKAGES_VERSION }} https://github.com/bmad-sim/bmad-external-packages.git ~/external_packages
- name: Extract dependencies
- name: Move External packages
run: |
echo "GITHUB_WORKSPACE: $GITHUB_WORKSPACE"
for dep in ~/external_deps/*.tar.gz; \
do \
tar xzvf $dep -C $GITHUB_WORKSPACE/; \
for dep in ~/external_packages/*; \
do if [ $dep != "README.md" ]; \
then cp -r $dep $GITHUB_WORKSPACE/; \
fi; \
done
- name: Assemble Tarball
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,19 @@ If you want to compile Bmad directly, download a [Release](https://github.com/bm

## Developer Setup

Developers should clone this repository, as well as its external dependencies:
Developers should clone this repository, as well as its external packages:

```bash
git clone https://github.com/bmad-sim/bmad-ecosystem.git
git clone https://github.com/bmad-sim/bmad-external-deps.git
git clone https://github.com/bmad-sim/bmad-external-packages.git
```

The external dependencies repository is simply a set of compressed files. A simple bash script is provided to extract these into the `bmad-ecosystem`:
The external packages repository is simply a set of libraries needed by Bmad.

```bash
cd bmad-ecosystem
bash util/extract_external_deps
rm ../bmad-external-packages/README.md # Do not copy this file
cp -r ../bmad-external-packages .
```

To build everything:
Expand Down
2 changes: 1 addition & 1 deletion tao/version/tao_version_mod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
!-

module tao_version_mod
character(*), parameter :: tao_version_date = "2024/07/15 13:46:54"
character(*), parameter :: tao_version_date = "2024/07/15 21:04:15"
end module

0 comments on commit d97b1d2

Please sign in to comment.