diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff3a832631530..4770f7a0662a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,121 +29,6 @@ defaults: run: shell: bash jobs: - pr: - name: PR - env: - CI_JOB_NAME: "${{ matrix.name }}" - SCCACHE_BUCKET: rust-lang-ci-sccache2 - TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" - CACHE_DOMAIN: ci-caches.rust-lang.org - if: "github.event_name == 'pull_request'" - strategy: - matrix: - include: - - name: mingw-check - os: ubuntu-20.04-xl - env: {} - - name: x86_64-gnu-llvm-12 - os: ubuntu-20.04-xl - env: {} - - name: x86_64-gnu-tools - env: - CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 - os: ubuntu-20.04-xl - timeout-minutes: 600 - runs-on: "${{ matrix.os }}" - steps: - - name: disable git crlf conversion - run: git config --global core.autocrlf false - - name: checkout the source code - uses: actions/checkout@v2 - with: - fetch-depth: 2 - - name: configure the PR in which the error message will be posted - run: "echo \"[CI_PR_NUMBER=$num]\"" - env: - num: "${{ github.event.number }}" - if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'" - - name: add extra environment variables - run: src/ci/scripts/setup-environment.sh - env: - EXTRA_VARIABLES: "${{ toJson(matrix.env) }}" - if: success() && !env.SKIP_JOB - - name: decide whether to skip this job - run: src/ci/scripts/should-skip-this.sh - if: success() && !env.SKIP_JOB - - name: ensure the channel matches the target branch - run: src/ci/scripts/verify-channel.sh - if: success() && !env.SKIP_JOB - - name: configure GitHub Actions to kill the build when outdated - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master - with: - github_token: "${{ secrets.github_token }}" - if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - - name: collect CPU statistics - run: src/ci/scripts/collect-cpu-stats.sh - if: success() && !env.SKIP_JOB - - name: show the current environment - run: src/ci/scripts/dump-environment.sh - if: success() && !env.SKIP_JOB - - name: install awscli - run: src/ci/scripts/install-awscli.sh - if: success() && !env.SKIP_JOB - - name: install sccache - run: src/ci/scripts/install-sccache.sh - if: success() && !env.SKIP_JOB - - name: install clang - run: src/ci/scripts/install-clang.sh - if: success() && !env.SKIP_JOB - - name: install WIX - run: src/ci/scripts/install-wix.sh - if: success() && !env.SKIP_JOB - - name: ensure the build happens on a partition with enough space - run: src/ci/scripts/symlink-build-dir.sh - if: success() && !env.SKIP_JOB - - name: disable git crlf conversion - run: src/ci/scripts/disable-git-crlf-conversion.sh - if: success() && !env.SKIP_JOB - - name: checkout submodules - run: src/ci/scripts/checkout-submodules.sh - if: success() && !env.SKIP_JOB - - name: install MSYS2 - run: src/ci/scripts/install-msys2.sh - if: success() && !env.SKIP_JOB - - name: install MinGW - run: src/ci/scripts/install-mingw.sh - if: success() && !env.SKIP_JOB - - name: install ninja - run: src/ci/scripts/install-ninja.sh - if: success() && !env.SKIP_JOB - - name: enable ipv6 on Docker - run: src/ci/scripts/enable-docker-ipv6.sh - if: success() && !env.SKIP_JOB - - name: disable git crlf conversion - run: src/ci/scripts/disable-git-crlf-conversion.sh - if: success() && !env.SKIP_JOB - - name: ensure line endings are correct - run: src/ci/scripts/verify-line-endings.sh - if: success() && !env.SKIP_JOB - - name: ensure backported commits are in upstream branches - run: src/ci/scripts/verify-backported-commits.sh - if: success() && !env.SKIP_JOB - - name: ensure the stable version number is correct - run: src/ci/scripts/verify-stable-version-number.sh - if: success() && !env.SKIP_JOB - - name: run the build - run: src/ci/scripts/run-build-from-ci.sh - env: - AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" - AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" - TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}" - if: success() && !env.SKIP_JOB - - name: upload artifacts to S3 - run: src/ci/scripts/upload-artifacts.sh - env: - AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}" - AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}" - if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')" auto: name: auto env: @@ -558,7 +443,7 @@ jobs: strategy: matrix: include: - - name: dist-x86_64-linux + - name: dist-powerpc64-linux os: ubuntu-20.04-xl env: {} timeout-minutes: 600 diff --git a/src/ci/docker/scripts/cmake.sh b/src/ci/docker/scripts/cmake.sh index 70096173403d7..8e037e675ac4f 100755 --- a/src/ci/docker/scripts/cmake.sh +++ b/src/ci/docker/scripts/cmake.sh @@ -2,7 +2,7 @@ set -ex hide_output() { - set +x + # set +x on_err=" echo ERROR: An error was encountered with the build. cat /tmp/build.log @@ -15,7 +15,7 @@ exit 1 trap - ERR kill $PING_LOOP_PID rm /tmp/build.log - set -x + # set -x } # LLVM 12 requires CMake 3.13.4 or higher. @@ -25,6 +25,9 @@ curl -L https://github.com/Kitware/CMake/releases/download/v$CMAKE/cmake-$CMAKE. mkdir cmake-build cd cmake-build +ls -al /tmp/build.log || true +whoami +echo foo &> /tmp/build.log hide_output ../cmake-$CMAKE/configure hide_output make -j$(nproc) hide_output make install diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 5622422d50f52..6340181f0371e 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -276,25 +276,25 @@ defaults: shell: bash jobs: - pr: - <<: *base-ci-job - name: PR - env: - <<: [*shared-ci-variables, *public-variables] - if: github.event_name == 'pull_request' - strategy: - matrix: - include: - - name: mingw-check - <<: *job-linux-xl - - - name: x86_64-gnu-llvm-12 - <<: *job-linux-xl - - - name: x86_64-gnu-tools - env: - CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 - <<: *job-linux-xl + # pr: + # <<: *base-ci-job + # name: PR + # env: + # <<: [*shared-ci-variables, *public-variables] + # if: github.event_name == 'pull_request' + # strategy: + # matrix: + # include: + # - name: mingw-check + # <<: *job-linux-xl + + # - name: x86_64-gnu-llvm-12 + # <<: *job-linux-xl + + # - name: x86_64-gnu-tools + # env: + # CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 + # <<: *job-linux-xl auto: <<: *base-ci-job @@ -691,8 +691,7 @@ jobs: strategy: matrix: include: - - &dist-x86_64-linux - name: dist-x86_64-linux + - name: dist-powerpc64-linux <<: *job-linux-xl master: