From 9a84b3923db0653f01ab7d8541645007347c4db4 Mon Sep 17 00:00:00 2001
From: Signal Linden <signal@lindenlab.com>
Date: Mon, 10 Oct 2022 09:40:32 -0700
Subject: [PATCH] Separate autobuild install from build
---
.github/workflows/build.yaml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3fce1da35ff..16c794cde55 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,14 +12,15 @@ jobs:
matrix:
os: [windows-2019, macos-11]
configuration: [RelWithDebInfoOS]
- arch: [64]
+ addrsize: [64]
include:
- os: windows-2019
configuration: RelWithDebInfoOS
- arch: 32
+ addrsize: 32
runs-on: ${{ matrix.os }}
env:
- AUTOBUILD_ADDRSIZE: ${{ matrix.arch }}
+ AUTOBUILD_CONFIGURATION: ${{ matrix.configuration }}
+ AUTOBUILD_ADDRSIZE: ${{ matrix.addrsize }}
AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables
AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.build-variables/variables
steps:
@@ -45,9 +46,10 @@ jobs:
path: .autobuild-installables
key: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }}
+ - name: Install autobuild packages
+ run: autobuild install
+
- name: Build
- shell: bash
run: |
- autobuild install
autobuild configure -c ${{ matrix.configuration }}
autobuild build --no-configure
--
GitLab