diff --git a/.circleci/config.yml b/.circleci/config.yml index 605a6faee..bd1916205 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,9 +11,9 @@ jobs: - run: make -j2 - run: make package - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - run: ./script/copy-artifacts-to-host.sh /root/debs - store_artifacts: path: /root/debs/ - - run: ./script/copy-artifacts-to-host.sh build_ubuntu_focal: docker: - image: ubuntu:focal @@ -25,9 +25,9 @@ jobs: - run: make -j2 - run: make package - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - run: ./script/copy-artifacts-to-host.sh /root/debs - store_artifacts: path: /root/debs/ - - run: ./script/copy-artifacts-to-host.sh build_ubuntu_groovy: docker: - image: ubuntu:groovy @@ -39,9 +39,9 @@ jobs: - run: make -j2 - run: make package - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - run: ./script/copy-artifacts-to-host.sh /root/debs - store_artifacts: path: /root/debs/ - - run: ./script/copy-artifacts-to-host.sh build_fedora_31: docker: - image: fedora:31 @@ -52,9 +52,9 @@ jobs: - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - run: rpmbuild -ba -vv musikcube.spec - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ + - run: ./script/copy-artifacts-to-host.sh /root/rpms - store_artifacts: path: /root/rpms/ - - run: ./script/copy-artifacts-to-host.sh build_fedora_32: docker: - image: fedora:32 @@ -65,9 +65,9 @@ jobs: - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - run: rpmbuild -ba -vv musikcube.spec - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ + - run: ./script/copy-artifacts-to-host.sh /root/rpms - store_artifacts: path: /root/rpms/ - - run: ./script/copy-artifacts-to-host.sh build_fedora_33: docker: - image: fedora:33 @@ -78,9 +78,9 @@ jobs: - run: mkdir -p /root/rpmbuild/SOURCES && spectool -g -R musikcube.spec - run: rpmbuild -ba -vv musikcube.spec - run: mkdir -p /root/rpms && mv /root/rpmbuild/RPMS/x86_64/*.rpm /root/rpms/ + - run: ./script/copy-artifacts-to-host.sh /root/rpms - store_artifacts: path: /root/rpms/ - - run: ./script/copy-artifacts-to-host.sh workflow_filters: &workflow_filters filters: branches: diff --git a/script/copy-artifacts-to-host.sh b/script/copy-artifacts-to-host.sh index 2b21fc09e..7065ac789 100755 --- a/script/copy-artifacts-to-host.sh +++ b/script/copy-artifacts-to-host.sh @@ -8,5 +8,4 @@ if [[ -z "${MUSIKCUBE_BUILD_HOST_PW}" ]]; then exit fi -sshpass -p "${MUSIKCUBE_BUILD_HOST_PW}" scp /root/rpms/* build@${MUSIKCUBE_BUILD_HOST_IP}:/home/build/ 2> /dev/null -sshpass -p "${MUSIKCUBE_BUILD_HOST_PW}" scp /root/debs/* build@${MUSIKCUBE_BUILD_HOST_IP}:/home/build/ 2> /dev/null +sshpass -p ${MUSIKCUBE_BUILD_HOST_PW} scp "$1/*" build@${MUSIKCUBE_BUILD_HOST_IP}:/home/build/ 2> /dev/null