From 828d6f1104ade54383261af7b7ebdd8e757e1b8e Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 16 Mar 2024 19:30:41 -0700 Subject: [PATCH] [scripts] Merge .ci/ into scripts/ --- .github/workflows/api_doc.yml | 4 ++-- .github/workflows/ci_macos.yml | 4 ++-- .github/workflows/ci_ubuntu.yml | 5 ++--- .github/workflows/cleanup.yml | 2 +- {.ci => scripts}/build.sh | 2 +- {.ci => scripts}/build_docs.sh | 8 ++++---- {.ci => scripts}/cleanup.sh | 0 {.ci => scripts}/docker/env.list | 0 {.ci => scripts}/docs_versions.txt | 0 {.ci => scripts}/install_osx.sh | 0 10 files changed, 12 insertions(+), 13 deletions(-) rename {.ci => scripts}/build.sh (99%) rename {.ci => scripts}/build_docs.sh (84%) rename {.ci => scripts}/cleanup.sh (100%) rename {.ci => scripts}/docker/env.list (100%) rename {.ci => scripts}/docs_versions.txt (100%) rename {.ci => scripts}/install_osx.sh (100%) diff --git a/.github/workflows/api_doc.yml b/.github/workflows/api_doc.yml index 8f931e78b5851..84194b49f1ee6 100644 --- a/.github/workflows/api_doc.yml +++ b/.github/workflows/api_doc.yml @@ -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' }} diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml index d726d2177a45c..07e49c2084c8a 100644 --- a/.github/workflows/ci_macos.yml +++ b/.github/workflows/ci_macos.yml @@ -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 diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index a8d714379feb8..130bb8180f8f9 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -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 @@ -94,4 +94,3 @@ jobs: - name: Test DART and dartpy run: | pixi run build - diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index 785b39fd7a908..c37ad77e9f66c 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -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 }} diff --git a/.ci/build.sh b/scripts/build.sh similarity index 99% rename from .ci/build.sh rename to scripts/build.sh index 778269308a57b..725c13b7e2d56 100755 --- a/.ci/build.sh +++ b/scripts/build.sh @@ -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 diff --git a/.ci/build_docs.sh b/scripts/build_docs.sh similarity index 84% rename from .ci/build_docs.sh rename to scripts/build_docs.sh index 586619ecaf566..8f63accfc31fb 100755 --- a/.ci/build_docs.sh +++ b/scripts/build_docs.sh @@ -17,7 +17,7 @@ DART_DOCS_OUTPUT_DIR="${BUILD_DIR}/gh-pages" mkdir -p ${DART_DOCS_OUTPUT_DIR} # Initialize list of API versions -cat < ${DART_DOCS_OUTPUT_DIR}/index.md +cat <${DART_DOCS_OUTPUT_DIR}/index.md # DART API Documentation EOF @@ -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} @@ -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 diff --git a/.ci/cleanup.sh b/scripts/cleanup.sh similarity index 100% rename from .ci/cleanup.sh rename to scripts/cleanup.sh diff --git a/.ci/docker/env.list b/scripts/docker/env.list similarity index 100% rename from .ci/docker/env.list rename to scripts/docker/env.list diff --git a/.ci/docs_versions.txt b/scripts/docs_versions.txt similarity index 100% rename from .ci/docs_versions.txt rename to scripts/docs_versions.txt diff --git a/.ci/install_osx.sh b/scripts/install_osx.sh similarity index 100% rename from .ci/install_osx.sh rename to scripts/install_osx.sh