CI: reorganize resource files

2026-08-26 22:20:01 +12:00
parent fcb03056da
commit ac3111459c
29 changed files with 21 additions and 20 deletions
@@ -54,4 +54,4 @@ jobs:
          restore-keys: ${{ runner.os }}-cache-clang-${{ matrix.id }}-

      - name: Run
-        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e TRAVIS_BUILD_DIR="$PWD" -e PROJ_CMAKE_BUILD_OPTIONS="$PROJ_CMAKE_BUILD_OPTIONS" -e WORK_DIR="$PWD" -e TRAVIS_OS_NAME=linux -e BUILD_NAME=linux_clang -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/clang_linux/start.sh
+        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e TRAVIS_BUILD_DIR="$PWD" -e PROJ_CMAKE_BUILD_OPTIONS="$PROJ_CMAKE_BUILD_OPTIONS" -e WORK_DIR="$PWD" -e TRAVIS_OS_NAME=linux -e BUILD_NAME=linux_clang -v $PWD:$PWD ubuntu:20.04 $PWD/ci/clang_linux/start.sh
@@ -25,4 +25,4 @@ jobs:
        uses: actions/checkout@v7.0.1

      - name: Run
-        run: .github/workflows/clang_static_analyzer/start.sh
+        run: ci/clang_static_analyzer/start.sh
@@ -42,12 +42,12 @@ jobs:
    - name: Setup
      shell: bash -l {0}
      run: |
-          source ./scripts/ci/conda/setup.sh
+          source ./ci/conda/setup.sh

    - name: Build
      shell: bash -l {0}
      run: |
-          source ../scripts/ci/conda/compile.sh
+          source ../ci/conda/compile.sh
      working-directory: ./proj.4-feedstock


@@ -27,7 +27,7 @@ jobs:
        uses: actions/checkout@v7.0.1

      - name: Build docker
-        run: docker build -t proj-emscripten-builder scripts/ci/emscripten/
+        run: docker build -t proj-emscripten-builder ci/emscripten/

      - name: Artifacts folder
        run: mkdir -p "$PWD"/wasm_out
@@ -51,7 +51,7 @@ jobs:
        run: |
          mkdir -p "$PWD"/out_node
          cp wasm_out/projModule.* out_node
-          cp scripts/ci/emscripten/proj.ems.tests.js out_node
+          cp ci/emscripten/proj.ems.tests.js out_node

      - name: Run docker tests
        run: |
@@ -34,4 +34,4 @@ jobs:
          restore-keys: ${{ runner.os }}-cache-fedora_rawhide-

      - name: Run
-        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD fedora:rawhide $PWD/.github/workflows/fedora_rawhide/start.sh
+        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD fedora:rawhide $PWD/ci/fedora_rawhide/start.sh
@@ -34,4 +34,4 @@ jobs:
          restore-keys: ${{ runner.os }}-cache-gcc32bit-

      - name: Run
-        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux_gcc_32bit/start.sh
+        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:20.04 $PWD/ci/linux_gcc_32bit/start.sh
@@ -38,7 +38,7 @@ jobs:
      - uses: mamba-org/setup-micromamba@v3
        with:
          init-shell: bash
-          environment-file: .github/workflows/mac/environment.yml
+          environment-file: ci/mac/environment.yml

      - name: Cache
        uses: actions/cache@v6.1.0
@@ -51,13 +51,13 @@ jobs:
      - name: Install Requirements
        shell: bash -l {0}
        run: |
-          source .github/workflows/mac/before_install.sh
+          source ci/mac/before_install.sh

      - name: Build
        shell: bash -l {0}
        run: |
          export TRAVIS_BUILD_DIR=$PWD
-          source .github/workflows/mac/install.sh
+          source ci/mac/install.sh
        env:
            CCACHE_DIR: ${{ github.workspace }}/.ccache
            TRAVIS_OS_NAME: osx
@@ -34,4 +34,4 @@ jobs:
          restore-keys: ${{ runner.os }}-cache-mingw_w64-

      - name: Build
-        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e TRAVIS_OS_NAME=linux -e BUILD_NAME=mingw_w64 -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:22.04 $PWD/.github/workflows/mingw_w64/start.sh
+        run: docker run -e PROJ_GITHUB_SHA=${{ github.sha }} -e CI -e TRAVIS_OS_NAME=linux -e BUILD_NAME=mingw_w64 -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:22.04 $PWD/ci/mingw_w64/start.sh
@@ -39,9 +39,9 @@ matrix:
  allow_failures:
      - env: BUILD_NAME=mingw32

-before_install: ./travis/${BUILD_NAME}/before_install.sh
+before_install: ./ci/${BUILD_NAME}/before_install.sh

-install: ./travis/${BUILD_NAME}/install.sh
+install: ./ci/${BUILD_NAME}/install.sh

 script:
  - echo "done"
@@ -520,6 +520,7 @@ if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
    \\.deps
    /autogen\\.sh
    /autom4te\\.cache
+    /ci/
    /CODE_OF_CONDUCT.md
    /CONTRIBUTING.md
    /disabled_workflows/
@@ -28,7 +28,7 @@ fi
 ccache -M 500M

 # -fno-use-cxa-atexit is needed to build with -coverage
-CC="clang-10" CXX="clang++-10" CFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" CXXFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" LDFLAGS="-fsanitize=address" ./travis/install.sh
+CC="clang-10" CXX="clang++-10" CFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" CXXFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" LDFLAGS="-fsanitize=address" ./ci/install.sh

 echo "Saving ccache..."
 rm -f "$WORK_DIR/ccache.tar.gz"
@@ -43,7 +43,7 @@ fi

 ccache -M 500M

-CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" CMAKE_BUILD_TYPE=RelWithDebInfo ./travis/install.sh
+CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" CMAKE_BUILD_TYPE=RelWithDebInfo ./ci/install.sh

 echo "Saving ccache..."
 rm -f "$WORK_DIR/ccache.tar.gz"
@@ -2,8 +2,8 @@

 set -e

-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
+./ci/before_install_apt.sh
+./ci/before_install_pip.sh

 sudo apt-get install -qq \
    sqlite3 zip \
@@ -3,4 +3,4 @@
 set -e

 # -fno-use-cxa-atexit is needed to build with -coverage
-CFLAGS="-Werror" CXXFLAGS="-Werror" ./travis/install.sh
+CFLAGS="-Werror" CXXFLAGS="-Werror" ./ci/install.sh
@@ -4,4 +4,4 @@ set -e

 ccache -M 200M

-CC="clang" CXX="clang++" CFLAGS="-Werror" CXXFLAGS="-Werror" CMAKE_BUILD_TYPE=RelWithDebInfo ./travis/install.sh
+CC="clang" CXX="clang++" CFLAGS="-Werror" CXXFLAGS="-Werror" CMAKE_BUILD_TYPE=RelWithDebInfo ./ci/install.sh