diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-30 10:44:17 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-30 10:44:17 -0400 |
| commit | 153f5cdb9f060806472d76c7b57837cdbdf21b68 (patch) | |
| tree | 9c051cd800be8d679dec032844d8439aa5f1ff4d /.github | |
| parent | d62e7039dafe4a49d548225203785eeda0eeb44a (diff) | |
SL-18837: Revert "Install autobuild from source repo, not PyPI."
That doesn't seem to be the distinction between TC builds and GH builds.
Instead, we'll try unsetting AUTOBUILD_CONFIGURATION.
This reverts commit d62e7039dafe4a49d548225203785eeda0eeb44a.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yaml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 18e07aae5e..f5ed5ce2ae 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,6 @@ jobs: env: AUTOBUILD_ADDRSIZE: ${{ matrix.addrsize }} AUTOBUILD_BUILD_ID: ${{ github.run_id }} - autobuild_checkout: ${{ github.workspace}}/.autobuild AUTOBUILD_CONFIGURATION: ${{ matrix.configuration }} # authorizes fetching private constituent packages AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }} @@ -67,19 +66,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Checkout autobuild - uses: actions/checkout@v3 - # Bug in autobuild 3.9.2? The TC viewer build can successfully build - # llphysicsextensions/autobuild-tpv.xml, but the previous GH actions - # build failed: "no configuration for Release found" despite -c Tpv. - # The difference seems to be that we used 'pip3 install autobuild' - # from PyPI, whereas the TC buildscripts setup clones - # secondlife/autobuild branch v3 and installs from that repo. - with: - repository: secondlife/autobuild - ref: v3 - path: .autobuild - - name: Checkout build variables uses: actions/checkout@v3 with: @@ -94,10 +80,7 @@ jobs: path: .master-message-template - name: Install autobuild - shell: bash - run: | - pip3 install "$autobuild_checkout" - pip3 install llsd + run: pip3 install autobuild llsd - name: Cache autobuild packages uses: actions/cache@v3 |