mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 22:51:20 +02:00
how about this
This commit is contained in:
parent
17f579882a
commit
1e07971d10
2 changed files with 4 additions and 5 deletions
4
.github/workflows/master_build.yml
vendored
4
.github/workflows/master_build.yml
vendored
|
@ -49,8 +49,7 @@ jobs:
|
||||||
id: buildenv1
|
id: buildenv1
|
||||||
run: |
|
run: |
|
||||||
echo "UPLOAD_PREFIX=master" >> $GITHUB_ENV
|
echo "UPLOAD_PREFIX=master" >> $GITHUB_ENV
|
||||||
GIT_COMMIT_SHORT=echo $GIT_COMMIT | cut -c1-7
|
echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
|
||||||
echo "GIT_COMMIT_SHORT=$GIT_COMMIT_SHORT" >> $GITHUB_ENV
|
|
||||||
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
|
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
|
||||||
# Linux build variables
|
# Linux build variables
|
||||||
if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
|
if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
|
||||||
|
@ -87,6 +86,7 @@ jobs:
|
||||||
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
|
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
|
||||||
echo "ARTIFACT_PATTERN=Vircadia-Alpha-*.$INSTALLER_EXT" >> $GITHUB_ENV
|
echo "ARTIFACT_PATTERN=Vircadia-Alpha-*.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||||
# Build type variables
|
# Build type variables
|
||||||
|
echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV
|
||||||
if [ "${{ matrix.build_type }}" = "full" ]; then
|
if [ "${{ matrix.build_type }}" = "full" ]; then
|
||||||
echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
|
echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
|
||||||
echo "INSTALLER=Vircadia-Alpha-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
|
echo "INSTALLER=Vircadia-Alpha-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||||
|
|
5
.github/workflows/pr_build.yml
vendored
5
.github/workflows/pr_build.yml
vendored
|
@ -22,7 +22,6 @@ env:
|
||||||
|
|
||||||
# WIN32 specific variables
|
# WIN32 specific variables
|
||||||
PreferredToolArchitecture: X64
|
PreferredToolArchitecture: X64
|
||||||
GIT_COMMIT_SHORT: ${{ github.sha }}
|
|
||||||
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -49,8 +48,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
id: buildenv1
|
id: buildenv1
|
||||||
run: |
|
run: |
|
||||||
GIT_COMMIT_SHORT=echo $GIT_COMMIT | cut -c1-7
|
echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
|
||||||
echo "GIT_COMMIT_SHORT=$GIT_COMMIT_SHORT" >> $GITHUB_ENV
|
|
||||||
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
|
echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
|
||||||
|
|
||||||
# Linux build variables
|
# Linux build variables
|
||||||
|
@ -84,6 +82,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
|
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
|
||||||
|
echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV
|
||||||
if [[ "${{ matrix.build_type }}" != "android" ]]; then
|
if [[ "${{ matrix.build_type }}" != "android" ]]; then
|
||||||
echo "ARTIFACT_PATTERN=Vircadia-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV
|
echo "ARTIFACT_PATTERN=Vircadia-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV
|
||||||
# Build type variables
|
# Build type variables
|
||||||
|
|
Loading…
Reference in a new issue