This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch chandan/test in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 27a32567d969d9de2a8355d8d50b29ba9f9bd21b Author: Chandan Singh <[email protected]> AuthorDate: Fri Jan 15 00:16:06 2021 +0000 merge & release compose --- .github/workflows/merge.yml | 20 +++++++++----------- .github/workflows/release.yml | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 9facf26..9504154 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1,8 +1,7 @@ name: Merge actions env: - CI_IMAGE: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-master-132813612 - BST_FORCE_SESSION_REBUILD: 1 + CI_IMAGE_VERSION: master-241289109 on: push: @@ -20,16 +19,15 @@ jobs: with: fetch-depth: 0 - - name: Build documentation + - name: Give `testuser` ownership of the source directory + run: sudo chown -R 1000:1000 ${GITHUB_WORKSPACE} + + - name: Build documentation using Docker Compose run: | - docker run \ - --privileged \ - --device /dev/fuse \ - --env BST_FORCE_SESSION_REBUILD \ - --volume /home/runner/work:/__w \ - --workdir /__w/buildstream/buildstream \ - $CI_IMAGE \ - tox -e docs + docker-compose \ + --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \ + run \ + docs # Include a tarball in the published docs, allowing for # easy re-publishing of master docs on docs.buildstream.build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1153eab..722a0e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,7 @@ name: Upload Release Asset env: - CI_IMAGE: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-master-177137613 - BST_FORCE_SESSION_REBUILD: 1 + CI_IMAGE_VERSION: master-241289109 on: push: @@ -20,16 +19,16 @@ jobs: with: fetch-depth: 0 - - name: Build documentation + - name: Give `testuser` ownership of the source directory + run: sudo chown -R 1000:1000 ${GITHUB_WORKSPACE} + + - name: Build documentation using Docker Compose run: | - docker run \ - --privileged \ - --device /dev/fuse \ - --env BST_FORCE_SESSION_REBUILD \ - --volume /home/runner/work:/__w \ - --workdir /__w/buildstream/buildstream \ - $CI_IMAGE \ - tox -e docs + docker-compose \ + --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \ + run \ + docs + tar -C doc/build/html -zcf docs.tgz . - name: Upload release assets
