mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-16 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update linux Azure and re-enable GitHub pushing

Browse Source
This commit is contained in:
Zion Nimchuk 2023-08-30 09:56:18 -07:00 committed by Ivan
parent 02b5cae2ad
commit dd4df6a46b
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
azure-pipelines.yml
View File

@ -35,13 +35,13 @@ jobs:
displayName: ccache displayName: ccache
- bash: | - bash: |
docker pull --quiet rpcs3/rpcs3-ci-bionic:1.3 docker pull --quiet rpcs3/rpcs3-ci-focal:1.1
docker run \ docker run \
-v $(pwd):/rpcs3 \ -v $(pwd):/rpcs3 \
--env-file .ci/docker.env \ --env-file .ci/docker.env \
-v $CCACHE_DIR:/root/.ccache \ -v $CCACHE_DIR:/root/.ccache \
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
rpcs3/rpcs3-ci-bionic:1.3 \ rpcs3/rpcs3-ci-focal:1.1 \
/rpcs3/.ci/build-linux.sh /rpcs3/.ci/build-linux.sh
displayName: Docker setup and build displayName: Docker setup and build
@ -49,18 +49,18 @@ jobs:
condition: succeeded() condition: succeeded()
artifact: RPCS3 for Linux ($(COMPILER)) artifact: RPCS3 for Linux ($(COMPILER))
# - bash: | - bash: |
# COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp) COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
# COMM_COUNT=$(git rev-list --count HEAD) COMM_COUNT=$(git rev-list --count HEAD)
# COMM_HASH=$(git rev-parse --short=8 HEAD) COMM_HASH=$(git rev-parse --short=8 HEAD)
# export AVVER="${COMM_TAG}-${COMM_COUNT}" export AVVER="${COMM_TAG}-${COMM_COUNT}"
# .ci/github-upload.sh .ci/github-upload.sh
# condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'gcc')) condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'gcc'))
# displayName: Push build to GitHub displayName: Push build to GitHub
# env: env:
# RPCS3_TOKEN: $(RPCS3-Token) RPCS3_TOKEN: $(RPCS3-Token)
- job: Windows_Build - job: Windows_Build
variables: variables:
@ -121,8 +121,9 @@ jobs:
condition: succeeded() condition: succeeded()
artifact: RPCS3 for Windows artifact: RPCS3 for Windows
# - bash: .ci/github-upload.sh - bash: |
# condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) .ci/github-upload.sh
# displayName: Push build to GitHub condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
# env: displayName: Push build to GitHub
# RPCS3_TOKEN: $(RPCS3-Token) env:
RPCS3_TOKEN: $(RPCS3-Token)