Improve organization of CI workflow scripts and pip requirements (#45037)
This commit is contained in:
		
							
								
								
									
										3
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
								
							| @@ -12,6 +12,7 @@ updates: | ||||
|       interval: "daily" | ||||
|   # Requirements to run style checks | ||||
|   - package-ecosystem: "pip" | ||||
|     directory: "/.github/workflows/style" | ||||
|     directories: | ||||
|      - "/.github/workflows/requirements/*" | ||||
|     schedule: | ||||
|       interval: "daily" | ||||
|   | ||||
							
								
								
									
										3
									
								
								.github/workflows/bootstrap.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/bootstrap.yml
									
									
									
									
										vendored
									
									
								
							| @@ -152,7 +152,7 @@ jobs: | ||||
|                 not_found=0 | ||||
|                 old_path="$PATH" | ||||
|                 export PATH="$ver_dir:$PATH" | ||||
|                 ./bin/spack-tmpconfig -b ./.github/workflows/bootstrap-test.sh | ||||
|                 ./bin/spack-tmpconfig -b ./.github/workflows/bin/bootstrap-test.sh | ||||
|                 export PATH="$old_path" | ||||
|               fi | ||||
|             fi | ||||
| @@ -166,4 +166,3 @@ jobs: | ||||
|           source share/spack/setup-env.sh | ||||
|           spack -d gpg list | ||||
|           tree ~/.spack/bootstrap/store/ | ||||
|  | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/build-containers.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build-containers.yml
									
									
									
									
										vendored
									
									
								
							| @@ -76,7 +76,7 @@ jobs: | ||||
|         env: | ||||
|           SPACK_YAML_OS: "${{ matrix.dockerfile[2] }}" | ||||
|         run: | | ||||
|           .github/workflows/generate_spack_yaml_containerize.sh | ||||
|           .github/workflows/bin/generate_spack_yaml_containerize.sh | ||||
|           . share/spack/setup-env.sh | ||||
|           mkdir -p dockerfiles/${{ matrix.dockerfile[0] }} | ||||
|           spack containerize --last-stage=bootstrap | tee dockerfiles/${{ matrix.dockerfile[0] }}/Dockerfile | ||||
|   | ||||
							
								
								
									
										8
									
								
								.github/workflows/install_spack.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/install_spack.sh
									
									
									
									
										vendored
									
									
								
							| @@ -1,8 +0,0 @@ | ||||
| #!/usr/bin/env sh | ||||
| . share/spack/setup-env.sh | ||||
| echo -e "config:\n  build_jobs: 2" > etc/spack/config.yaml | ||||
| spack config add "packages:all:target:[x86_64]" | ||||
| spack compiler find | ||||
| spack compiler info apple-clang | ||||
| spack debug report | ||||
| spack solve zlib | ||||
							
								
								
									
										12
									
								
								.github/workflows/unit_tests.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/unit_tests.yaml
									
									
									
									
										vendored
									
									
								
							| @@ -72,7 +72,7 @@ jobs: | ||||
|       run: | | ||||
|           # Need this for the git tests to succeed. | ||||
|           git --version | ||||
|           . .github/workflows/setup_git.sh | ||||
|           . .github/workflows/bin/setup_git.sh | ||||
|     - name: Bootstrap clingo | ||||
|       if: ${{ matrix.concretizer == 'clingo' }} | ||||
|       env: | ||||
| @@ -118,7 +118,7 @@ jobs: | ||||
|       run: | | ||||
|           # Need this for the git tests to succeed. | ||||
|           git --version | ||||
|           . .github/workflows/setup_git.sh | ||||
|           . .github/workflows/bin/setup_git.sh | ||||
|     - name: Run shell tests | ||||
|       env: | ||||
|           COVERAGE: true | ||||
| @@ -147,7 +147,7 @@ jobs: | ||||
|           git --version | ||||
|           git config --global --add safe.directory /__w/spack/spack | ||||
|           git fetch --unshallow | ||||
|           . .github/workflows/setup_git.sh | ||||
|           . .github/workflows/bin/setup_git.sh | ||||
|           useradd spack-test | ||||
|           chown -R spack-test . | ||||
|     - name: Run unit tests | ||||
| @@ -178,7 +178,7 @@ jobs: | ||||
|       run: | | ||||
|           # Need this for the git tests to succeed. | ||||
|           git --version | ||||
|           . .github/workflows/setup_git.sh | ||||
|           . .github/workflows/bin/setup_git.sh | ||||
|     - name: Run unit tests (full suite with coverage) | ||||
|       env: | ||||
|           COVERAGE: true | ||||
| @@ -217,7 +217,7 @@ jobs: | ||||
|         SPACK_TEST_PARALLEL: 4 | ||||
|       run: | | ||||
|         git --version | ||||
|         . .github/workflows/setup_git.sh | ||||
|         . .github/workflows/bin/setup_git.sh | ||||
|         . share/spack/setup-env.sh | ||||
|         $(which spack) bootstrap disable spack-install | ||||
|         $(which spack) solve zlib | ||||
| @@ -247,7 +247,7 @@ jobs: | ||||
|           python -m pip install --upgrade pip pywin32 setuptools pytest-cov clingo | ||||
|     - name: Create local develop | ||||
|       run: | | ||||
|         ./.github/workflows/setup_git.ps1 | ||||
|         ./.github/workflows/bin/setup_git.ps1 | ||||
|     - name: Unit Test | ||||
|       run: | | ||||
|         spack unit-test -x --verbose --cov --cov-config=pyproject.toml | ||||
|   | ||||
							
								
								
									
										8
									
								
								.github/workflows/valid-style.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/valid-style.yml
									
									
									
									
										vendored
									
									
								
							| @@ -26,7 +26,7 @@ jobs: | ||||
|     - name: Install Python Packages | ||||
|       run: | | ||||
|         pip install --upgrade pip setuptools | ||||
|         pip install -r .github/workflows/style/requirements.txt | ||||
|         pip install -r .github/workflows/requirements/style/requirements.txt | ||||
|     - name: vermin (Spack's Core) | ||||
|       run: vermin --backport importlib --backport argparse --violations --backport typing -t=3.6- -vvv lib/spack/spack/ lib/spack/llnl/ bin/ | ||||
|     - name: vermin (Repositories) | ||||
| @@ -45,12 +45,12 @@ jobs: | ||||
|     - name: Install Python packages | ||||
|       run: | | ||||
|         pip install --upgrade pip setuptools | ||||
|         pip install -r .github/workflows/style/requirements.txt | ||||
|         pip install -r .github/workflows/requirements/style/requirements.txt | ||||
|     - name: Setup git configuration | ||||
|       run: | | ||||
|         # Need this for the git tests to succeed. | ||||
|         git --version | ||||
|         . .github/workflows/setup_git.sh | ||||
|         . .github/workflows/bin/setup_git.sh | ||||
|     - name: Run style tests | ||||
|       run: | | ||||
|           share/spack/qa/run-style-tests | ||||
| @@ -76,7 +76,7 @@ jobs: | ||||
|           git --version | ||||
|           git config --global --add safe.directory /__w/spack/spack | ||||
|           git fetch --unshallow | ||||
|           . .github/workflows/setup_git.sh | ||||
|           . .github/workflows/bin/setup_git.sh | ||||
|           useradd spack-test | ||||
|           chown -R spack-test . | ||||
|       - name: Bootstrap Spack development environment | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Alec Scott
					Alec Scott