diff options
author | Pierre Ossman <ossman@cendio.se> | 2022-07-05 16:06:56 +0200 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2022-07-05 16:06:56 +0200 |
commit | d0dafdcc86275093611f302e93f6989f8e6e8de5 (patch) | |
tree | ca509b906e2cd18c296539089b97fdba750fd214 | |
parent | 7226e1968f9e3338193772e758e23179a84b4e35 (diff) | |
parent | 1597495d0c6280800cdf337afcd234f9bbca5f22 (diff) | |
download | tigervnc-d0dafdcc86275093611f302e93f6989f8e6e8de5.tar.gz tigervnc-d0dafdcc86275093611f302e93f6989f8e6e8de5.zip |
Merge branch 'artifacts' of https://github.com/CendioOssman/tigervnc
-rwxr-xr-x | .github/containers/bionic/build.sh | 3 | ||||
-rwxr-xr-x | .github/containers/centos7/build.sh | 4 | ||||
-rwxr-xr-x | .github/containers/centos8/build.sh | 4 | ||||
-rwxr-xr-x | .github/containers/focal/build.sh | 3 | ||||
-rw-r--r-- | .github/workflows/build.yml | 20 |
5 files changed, 34 insertions, 0 deletions
diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh index 82cf2d9c..ebbc50c4 100755 --- a/.github/containers/bionic/build.sh +++ b/.github/containers/bionic/build.sh @@ -53,3 +53,6 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/ sudo apt-get -f install -y && cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage " + +mkdir -p ${CURDIR}/result +cp -av ${CURDIR}/build/*.deb ${CURDIR}/result diff --git a/.github/containers/centos7/build.sh b/.github/containers/centos7/build.sh index ad55b20e..6d1f9364 100755 --- a/.github/containers/centos7/build.sh +++ b/.github/containers/centos7/build.sh @@ -39,3 +39,7 @@ docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tig sudo chown 0.0 ~/rpmbuild/SPECS/* && rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec " + +mkdir -p ${CURDIR}/result +cp -av ${CURDIR}/rpmbuild/RPMS ${CURDIR}/result +cp -av ${CURDIR}/rpmbuild/SRPMS ${CURDIR}/result diff --git a/.github/containers/centos8/build.sh b/.github/containers/centos8/build.sh index 91caffb5..cf8a82c3 100755 --- a/.github/containers/centos8/build.sh +++ b/.github/containers/centos8/build.sh @@ -38,3 +38,7 @@ docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tig sudo chown 0.0 ~/rpmbuild/SPECS/* && rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec " + +mkdir -p ${CURDIR}/result +cp -av ${CURDIR}/rpmbuild/RPMS ${CURDIR}/result +cp -av ${CURDIR}/rpmbuild/SRPMS ${CURDIR}/result diff --git a/.github/containers/focal/build.sh b/.github/containers/focal/build.sh index 3b68e70f..3e6e5c09 100755 --- a/.github/containers/focal/build.sh +++ b/.github/containers/focal/build.sh @@ -53,3 +53,6 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/ sudo apt-get -f install -y && cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage " + +mkdir -p ${CURDIR}/result +cp -av ${CURDIR}/build/*.deb ${CURDIR}/result diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdd1f326..b1d570ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,10 @@ jobs: - name: Install working-directory: build run: make tarball + - uses: actions/upload-artifact@v3 + with: + name: Linux (Ubuntu) + path: build/tigervnc-*.tar.gz build-windows: runs-on: windows-latest @@ -44,6 +48,10 @@ jobs: env: MSYS2_PATH_TYPE: inherit run: make installer winvnc_installer + - uses: actions/upload-artifact@v3 + with: + name: Windows + path: build/release/tigervnc*.exe build-macos: runs-on: macos-latest @@ -60,6 +68,10 @@ jobs: - name: Install working-directory: build run: make dmg + - uses: actions/upload-artifact@v3 + with: + name: macOS + path: build/TigerVNC-*.dmg build-java: runs-on: ubuntu-latest @@ -79,6 +91,10 @@ jobs: - name: Build working-directory: java/build run: make + - uses: actions/upload-artifact@v3 + with: + name: Java (${{ matrix.java }}) + path: java/build/VncViewer.jar build-packages: strategy: @@ -98,3 +114,7 @@ jobs: run: docker build -t tigervnc/$DOCKER .github/containers/$DOCKER - name: Build packages run: .github/containers/$DOCKER/build.sh + - uses: actions/upload-artifact@v3 + with: + name: Packages (${{ matrix.target }}) + path: .github/containers/${{ matrix.target }}/result |