diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-26 14:22:54 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-26 14:22:54 -0700 |
| commit | cab312d10078d8088e4f9206bc6160980243cd8b (patch) | |
| tree | a1fe8cc9c9a44cab26837a4aab633880b2bd24a4 | |
| parent | 2ef42c8c3649898bdc9a2e5a95a5fa34a700daf9 (diff) | |
| parent | 9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff) | |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7e82e42862..c7a758bd0f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -65,7 +65,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Setup python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -86,7 +86,7 @@ jobs: run: pip3 install autobuild llsd - name: Cache autobuild packages - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-installables with: path: .autobuild-installables diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index b7f8ee41e6..69adf3456f 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -7.1.4 +7.1.5 |