summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/ISSUE_TEMPLATE/10-bug.yaml4
-rw-r--r--.github/workflows/build.yaml157
-rw-r--r--.github/workflows/tag-release.yaml15
3 files changed, 69 insertions, 107 deletions
diff --git a/.github/ISSUE_TEMPLATE/10-bug.yaml b/.github/ISSUE_TEMPLATE/10-bug.yaml
index 41208e8bf5..612f71ace6 100644
--- a/.github/ISSUE_TEMPLATE/10-bug.yaml
+++ b/.github/ISSUE_TEMPLATE/10-bug.yaml
@@ -11,8 +11,8 @@ body:
- type: textarea
attributes:
label: Environment
- description: About Second Life Text
- placeholder: ex. Second Life Test 7.1.3.240191747 (64bit) ...
+ description: "Please copy the info from the viewer's 'About Second Life' window and paste it here:"
+ placeholder: 'ex. Second Life Release 7.1.8.9375512768 (64bit) ...'
validations:
required: true
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 964e4e3e0b..2cb94c9c90 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,62 +7,51 @@ on:
tags: ["Second_Life*"]
jobs:
- # The whole point of the setvar job is that we want to set a variable once
- # that will be consumed by multiple subsequent jobs. We tried setting it in
- # the global env, but a job.env can't directly reference the global env
- # context.
- setvar:
+ # The whole point of the setup job is that we want to set variables once
+ # that will be consumed by multiple subsequent jobs.
+ setup:
runs-on: ubuntu-latest
outputs:
release_run: ${{ steps.setvar.outputs.release_run }}
- branch: ${{ steps.which-branch.outputs.branch }}
- relnotes: ${{ steps.which-branch.outputs.relnotes }}
+ configurations: ${{ steps.setvar.outputs.configurations }}
+ bugsplat_db: ${{ steps.setvar.outputs.bugsplat_db }}
env:
# Build with a tag like "Second_Life#abcdef0" to generate a release page
# (used for builds we are planning to deploy).
- # Even though inputs.release_run is specified with type boolean, which
- # correctly presents a checkbox, its *value* is a GH workflow string
- # 'true' or 'false'. If you simply test github.event.inputs.release_run,
- # it always evaluates as true because it's a non-empty string either way.
# When you want to use a string variable as a workflow YAML boolean, it's
# important to ensure it's the empty string when false. If you omit || '',
- # its value when false is "false", which (again) is interpreted as true.
- RELEASE_RUN: ${{ (github.event.inputs.release_run != 'false' || (github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life'))) && 'Y' || '' }}
+ # its value when false is "false", which is interpreted as true.
+ RELEASE_RUN: ${{ (github.event.inputs.release_run || github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life')) && 'Y' || '' }}
+ FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
steps:
- - name: Set Variable
+ - name: Set Variables
id: setvar
shell: bash
run: |
echo "release_run=$RELEASE_RUN" >> "$GITHUB_OUTPUT"
- - name: Determine source branch
- id: which-branch
- uses: secondlife/viewer-build-util/which-branch@v2
- with:
- token: ${{ github.token }}
-
+ if [[ "$FROM_FORK" == "true" ]]; then
+ # PR from fork; don't build with Bugsplat, proprietary libs
+ echo 'configurations=["ReleaseOS"]' >> $GITHUB_OUTPUT
+ echo "bugsplat_db=" >> $GITHUB_OUTPUT
+ else
+ echo 'configurations=["Release"]' >> $GITHUB_OUTPUT
+ echo "bugsplat_db=SecondLife_Viewer_2018" >> $GITHUB_OUTPUT
+ fi
build:
- needs: setvar
+ needs: setup
strategy:
matrix:
- runner: [windows-large, macos-12-xl, linux-large]
- configuration: [Release, ReleaseOS]
- Linden: [true]
- include:
- - runner: macos-12-xl
- developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
- exclude:
- - runner: windows-large
- configuration: ReleaseOS
- - runner: macos-12-xl
- configuration: ReleaseOS
- - runner: linux-large
- configuration: Release
+ runner: [windows-large, macos-12-xl]
+ configuration: ${{ fromJSON(needs.setup.outputs.configurations) }}
runs-on: ${{ matrix.runner }}
outputs:
viewer_channel: ${{ steps.build.outputs.viewer_channel }}
viewer_version: ${{ steps.build.outputs.viewer_version }}
- imagename: ${{ steps.build.outputs.imagename }}
+ viewer_branch: ${{ steps.which-branch.outputs.branch }}
+ relnotes: ${{ steps.which-branch.outputs.relnotes }}
+ imagename: ${{ steps.build.outputs.imagename }}
+ configuration: ${{ matrix.configuration }}
env:
AUTOBUILD_ADDRSIZE: 64
AUTOBUILD_BUILD_ID: ${{ github.run_id }}
@@ -75,12 +64,9 @@ jobs:
# autobuild-package.xml.
AUTOBUILD_VCS_INFO: "true"
AUTOBUILD_VSVER: "170"
- DEVELOPER_DIR: ${{ matrix.developer_dir }}
+ DEVELOPER_DIR: "/Applications/Xcode_14.0.1.app/Contents/Developer"
# Ensure that Linden viewer builds engage Bugsplat.
- BUGSPLAT_DB: ${{ matrix.Linden && 'SecondLife_Viewer_2018' || '' }}
- # Run BUILD steps for Release configuration.
- # Run BUILD steps for ReleaseOS configuration only for release runs.
- BUILD: ${{ (matrix.Linden || needs.setvar.outputs.release_run) && 'Y' || '' }}
+ BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
build_coverity: false
build_log_dir: ${{ github.workspace }}/.logs
build_viewer: true
@@ -99,19 +85,16 @@ jobs:
variants: ${{ matrix.configuration }}
steps:
- name: Checkout code
- if: env.BUILD
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- name: Setup python
- if: env.BUILD
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Checkout build variables
- if: env.BUILD
uses: actions/checkout@v4
with:
repository: secondlife/build-variables
@@ -119,19 +102,16 @@ jobs:
path: .build-variables
- name: Checkout master-message-template
- if: env.BUILD
uses: actions/checkout@v4
with:
repository: secondlife/master-message-template
path: .master-message-template
- name: Install autobuild and python dependencies
- if: env.BUILD
run: pip3 install autobuild llsd
- name: Cache autobuild packages
id: cache-installables
- if: env.BUILD
uses: actions/cache@v4
with:
path: .autobuild-installables
@@ -140,27 +120,17 @@ jobs:
${{ runner.os }}-64-${{ matrix.configuration }}-
${{ runner.os }}-64-
- - name: Install Linux dependencies
- if: runner.os == 'Linux'
- run: |
- sudo apt update
- sudo apt install -y \
- libpulse-dev libunwind-dev \
- libgl1-mesa-dev libglu1-mesa-dev libxinerama-dev \
- libxcursor-dev libxfixes-dev libgstreamer1.0-dev \
- libgstreamer-plugins-base1.0-dev ninja-build libxft-dev \
- llvm mold libpipewire-0.3-dev
-
- - name: Install windows dependencies
- if: env.BUILD && runner.os == 'Windows'
- run: choco install nsis-unicode
+ - name: Determine source branch
+ id: which-branch
+ uses: secondlife/viewer-build-util/which-branch@v2
+ with:
+ token: ${{ github.token }}
- name: Build
id: build
- if: env.BUILD
shell: bash
env:
- AUTOBUILD_VCS_BRANCH: ${{ needs.setvar.outputs.branch }}
+ AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }}
RUNNER_OS: ${{ runner.os }}
run: |
# set up things the viewer's build.sh script expects
@@ -232,23 +202,32 @@ jobs:
[[ "$arch" == "MINGW6" ]] && arch=CYGWIN
export AUTOBUILD="$(which autobuild)"
- # determine the viewer channel from the branch name
+ # determine the viewer channel from the branch or tag name
+ # trigger an EDU build by including "edu" in the tag
+ edu=${{ github.ref_type == 'tag' && contains(github.ref_name, 'edu') }}
+ echo "ref_type=${{ github.ref_type }}, ref_name=${{ github.ref_name }}, edu='$edu'"
branch=$AUTOBUILD_VCS_BRANCH
- IFS='/' read -ra ba <<< "$branch"
- prefix=${ba[0]}
- if [ "$prefix" == "project" ]; then
- IFS='_' read -ra prj <<< "${ba[1]}"
- # uppercase first letter of each word
- export viewer_channel="Second Life Project ${prj[*]^}"
- elif [[ "$prefix" == "release" || "$prefix" == "main" ]];
+ if [[ "$edu" == "true" ]]
then
- export viewer_channel="Second Life Release"
+ export viewer_channel="Second Life Release edu"
elif [[ "$branch" == "develop" ]];
then
export viewer_channel="Second Life Develop"
else
- export viewer_channel="Second Life Test"
+ IFS='/' read -ra ba <<< "$branch"
+ prefix=${ba[0]}
+ if [ "$prefix" == "project" ]; then
+ IFS='_' read -ra prj <<< "${ba[1]}"
+ # uppercase first letter of each word
+ export viewer_channel="Second Life Project ${prj[*]^}"
+ elif [[ "$prefix" == "release" || "$prefix" == "main" ]];
+ then
+ export viewer_channel="Second Life Release"
+ else
+ export viewer_channel="Second Life Test"
+ fi
fi
+ echo "viewer_channel=$viewer_channel"
echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
# On windows we need to point the build to the correct python
# as neither CMake's FindPython nor our custom Python.cmake module
@@ -262,13 +241,6 @@ jobs:
fi
export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
- # Compile with clang, link with mold on linux.
- if [[ "$RUNNER_OS" == "Linux" ]]; then
- export CC=clang
- export CXX=clang++
- export CMAKE_OPTIONS='-DLINK_WITH_MOLD=ON'
- fi
-
./build.sh
# Each artifact is downloaded as a distinct .zip file. Multiple jobs
@@ -290,26 +262,23 @@ jobs:
echo "artifact=$RUNNER_OS$cfg_suffix" >> $GITHUB_OUTPUT
- name: Upload executable
- if: (matrix.Linden && steps.build.outputs.viewer_app) || runner.os == 'Linux'
+ if: steps.build.outputs.viewer_app
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-app"
path: |
${{ steps.build.outputs.viewer_app }}
-
# The other upload of nontrivial size is the symbol file. Use a distinct
# artifact for that too.
- name: Upload symbol file
- if: matrix.Linden
+ if: steps.build.outputs.symbolfile
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-symbols"
- path: |
- ${{ steps.build.outputs.symbolfile }}
+ path: ${{ steps.build.outputs.symbolfile }}
- name: Upload metadata
- if: matrix.Linden
uses: actions/upload-artifact@v4
with:
name: "${{ steps.build.outputs.artifact }}-metadata"
@@ -320,7 +289,7 @@ jobs:
- name: Upload physics package
uses: actions/upload-artifact@v4
# should only be set for viewer-private
- if: matrix.Linden && steps.build.outputs.physicstpv
+ if: matrix.configuration == 'Release' && steps.build.outputs.physicstpv
with:
name: "${{ steps.build.outputs.artifact }}-physics"
# emitted by build.sh, zero or one lines
@@ -394,6 +363,7 @@ jobs:
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
needs: build
+ if: needs.build.outputs.configuration == 'Release'
runs-on: ubuntu-latest
steps:
- name: Download viewer exe
@@ -428,6 +398,7 @@ jobs:
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
needs: build
+ if: needs.build.outputs.configuration == 'Release'
runs-on: ubuntu-latest
steps:
- name: Download Mac Symbols
@@ -448,13 +419,9 @@ jobs:
files: "**/*.xcarchive.zip"
release:
- needs: [setvar, build, sign-and-package-windows, sign-and-package-mac]
+ needs: [setup, build, sign-and-package-windows, sign-and-package-mac]
runs-on: ubuntu-latest
- # action-gh-release requires a tag (presumably for automatic generation of
- # release notes). Possible TODO: if we arrive here but do not have a
- # suitable tag for github.sha, create one? If we do that, of course remove
- # this == 'tag' condition.
- if: needs.setvar.outputs.release_run && github.ref_type == 'tag'
+ if: needs.setup.outputs.release_run
steps:
- uses: actions/download-artifact@v4
with:
@@ -464,10 +431,6 @@ jobs:
with:
pattern: "*-metadata"
- - uses: actions/download-artifact@v4
- with:
- pattern: "LinuxOS-app"
-
- name: Rename metadata
run: |
cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
@@ -488,7 +451,7 @@ jobs:
Build ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
${{ needs.build.outputs.viewer_channel }}
${{ needs.build.outputs.viewer_version }}
- ${{ needs.setvar.outputs.relnotes }}
+ ${{ needs.build.outputs.relnotes }}
prerelease: true
generate_release_notes: true
target_commitish: ${{ github.sha }}
diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml
index b73ec502f1..65d1d43a83 100644
--- a/.github/workflows/tag-release.yaml
+++ b/.github/workflows/tag-release.yaml
@@ -26,23 +26,22 @@ on:
jobs:
tag-release:
runs-on: ubuntu-latest
- env:
- GITHUB_TAG_TOKEN: ${{ secrets.GITHUB_TAG_TOKEN }}
steps:
- name: Setup Env Vars
run: |
CHANNEL="${{ inputs.channel }}"
echo VIEWER_CHANNEL="Second_Life_${CHANNEL:-Develop}" >> ${GITHUB_ENV}
- echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV}
+ NIGHTLY_DATE=$(date --rfc-3339=date)
+ echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV}
+ echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" >> ${GITHUB_ENV}
- name: Update Tag
uses: actions/github-script@v7.0.1
- if: env.GITHUB_TAG_TOKEN
with:
- github-token: ${{ env.GITHUB_TAG_TOKEN }}
+ github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
- github.rest.git.createRef(
+ github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
- ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.NIGHTLY_DATE }}",
+ ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.TAG_ID }}",
sha: context.sha
- )
+ })
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 03:47:24 +0000