diff --git a/.github/template_gitref b/.github/template_gitref index 53d156174..0616c6fa2 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-331-ga8209e4 +2021.08.26-334-gb19dead diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 81ca94db2..e112f554b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,11 +88,13 @@ jobs: run: | .github/workflows/scripts/install_ruby_client.sh shell: "bash" + - name: "Upload python client packages" uses: "actions/upload-artifact@v4" with: name: "python-client.tar" - path: "pulp_container/container-python-client.tar" + path: | + pulp_container/container-python-client.tar if-no-files-found: "error" overwrite: true @@ -100,14 +102,16 @@ jobs: uses: "actions/upload-artifact@v4" with: name: "python-client-docs.tar" - path: "pulp_container/container-python-client-docs.tar" + path: | + pulp_container/container-python-client-docs.tar if-no-files-found: "error" overwrite: true - name: "Upload ruby client packages" uses: "actions/upload-artifact@v4" with: name: "ruby-client.tar" - path: "pulp_container/container-ruby-client.tar" + path: | + pulp_container/container-ruby-client.tar if-no-files-found: "error" overwrite: true - name: Build docs diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 14e62d239..b2f845259 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -145,6 +145,9 @@ sudo chown -R 700:700 ~/.config echo ::group::SSL # Copy pulp CA sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certificates/pulp_webserver.crt +if [[ "ghcr.io/pulp/pulp-ci-centos" = */pulp-ci-centos9 ]]; then + sudo docker exec -u root pulp trust anchor /etc/pulp/certs/pulp_webserver.crt +fi # Hack: adding pulp CA to certifi.where() CERTIFI=$(python -c 'import certifi; print(certifi.where())') @@ -173,6 +176,9 @@ if [[ "$TEST" = "azure" ]]; then cat /usr/local/share/ca-certificates/azcert.crt >> $AZCERTIFI cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a "$PULPCERTIFI" > /dev/null cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a /etc/pki/tls/cert.pem > /dev/null + if [[ "ghcr.io/pulp/pulp-ci-centos" = */pulp-ci-centos9 ]]; then + cmd_stdin_prefix sudo trust anchor /etc/pki/tls/cert.pem + fi AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=https;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=https://ci-azurite:10000/devstoreaccount1;' az storage container create --name pulp-test --connection-string $AZURE_STORAGE_CONNECTION_STRING fi diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh index f4d6e910d..f3509a61d 100755 --- a/.github/workflows/scripts/publish_client_pypi.sh +++ b/.github/workflows/scripts/publish_client_pypi.sh @@ -24,10 +24,8 @@ RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https:/ if [ "$RESPONSE" == "200" ]; then echo "pulp_container client $VERSION has already been released. Skipping." - exit +else + twine upload -u __token__ -p "$PYPI_API_TOKEN" \ + "dist/pulp_container_client-$VERSION-py3-none-any.whl" \ + "dist/pulp_container-client-$VERSION.tar.gz" fi - -twine upload -u __token__ -p "$PYPI_API_TOKEN" \ -"dist/pulp_container_client-$VERSION-py3-none-any.whl" \ -"dist/pulp_container-client-$VERSION.tar.gz" \ -; diff --git a/docs/template_gitref b/docs/template_gitref index 53d156174..0616c6fa2 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-331-ga8209e4 +2021.08.26-334-gb19dead