Skip to content

Commit

Permalink
[scripts] Merge .ci/ into scripts/
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Mar 17, 2024
1 parent 2e5441d commit 828d6f1
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/api_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ jobs:
run: |
docker run \
--volume $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
--env-file ./.ci/docker/env.list \
--env-file ./scripts/docker/env.list \
$DART_DEV_IMAGE:$DOCKER_TAG \
/bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/build.sh"
/bin/sh -c "cd $GITHUB_WORKSPACE && ./scripts/build.sh"
- name: Deploy
if: ${{ github.ref == 'refs/heads/main' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
- name: Install Dependencies
env:
INSTALL_OSG_HEAD: OFF # To avoid building OSG, until 3.7 is released.
run: .ci/install_osx.sh
run: scripts/install_osx.sh
- name: Build
run: sudo -E .ci/build.sh
run: sudo -E scripts/build.sh

build_on_pixi:
name: ${{ matrix.os }}-pixi
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ jobs:
$ci_env -e CI=true \
--platform $PLATFORM \
--volume $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
--env-file ./.ci/docker/env.list \
--env-file ./scripts/docker/env.list \
$DART_DEV_IMAGE:$DOCKER_TAG \
/bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/build.sh"
/bin/sh -c "cd $GITHUB_WORKSPACE && ./scripts/build.sh"
build_on_pixi:
name: ubuntu-pixi
Expand All @@ -94,4 +94,3 @@ jobs:
- name: Test DART and dartpy
run: |
pixi run build
2 changes: 1 addition & 1 deletion .github/workflows/cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
uses: actions/checkout@v4

- name: Run Delete Script
run: sh ./.ci/cleanup.sh dartsim dart
run: sh ./scripts/cleanup.sh dartsim dart
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .ci/build.sh → scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ fi

# Build API documentation and exit
if [ $BUILD_DOCS = "ON" ]; then
. "${BUILD_DIR}/.ci/build_docs.sh"
. "${BUILD_DIR}/scripts/build_docs.sh"
exit 0
fi

Expand Down
8 changes: 4 additions & 4 deletions .ci/build_docs.sh → scripts/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DART_DOCS_OUTPUT_DIR="${BUILD_DIR}/gh-pages"
mkdir -p ${DART_DOCS_OUTPUT_DIR}

# Initialize list of API versions
cat <<EOF > ${DART_DOCS_OUTPUT_DIR}/index.md
cat <<EOF >${DART_DOCS_OUTPUT_DIR}/index.md
# DART API Documentation
EOF

Expand All @@ -29,12 +29,12 @@ cd ${DART_DOCS_BUILD_DIR}
# Add entries
while read version; do
if [[ ${version} == DART* ]]; then
printf "\n### ${version}\n\n" >> ${DART_DOCS_OUTPUT_DIR}/index.md
printf "\n### ${version}\n\n" >>${DART_DOCS_OUTPUT_DIR}/index.md
continue
fi

# Add entry to list of API versions
printf "* [${version}](https://dartsim.github.io/dart/${version}/)\n" >> ${DART_DOCS_OUTPUT_DIR}/index.md
printf "* [${version}](https://dartsim.github.io/dart/${version}/)\n" >>${DART_DOCS_OUTPUT_DIR}/index.md

# Build documentation
git -C ${DART_CLONE_DIR} checkout ${version}
Expand All @@ -43,4 +43,4 @@ while read version; do
make docs

mv doxygen/html ${DART_DOCS_OUTPUT_DIR}/${version}
done < ${DART_CLONE_DIR}/.ci/docs_versions.txt
done <${DART_CLONE_DIR}/scripts/docs_versions.txt
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 828d6f1

Please sign in to comment.