Skip to content

Pick some changes to 1.10.x branch to be able to release #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Blizzara wants to merge 2 commits into
base: release/1.10.x
Choose a base branch
from
Draft

Pick some changes to 1.10.x branch to be able to release #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e9428e
update config.yml based on develop
Jan 17, 2023
73d5a8b
fix bintray urls
Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: 2
jobs:
generate-bindings:
docker:
- image: circleci/openjdk:8u171-jdk-node-browsers
- image: cimg/openjdk:11.0.10-node
steps:
- checkout

Expand All @@ -27,7 +27,7 @@ jobs:

py27:
docker:
- image: circleci/python:2.7.15
- image: cimg/python:2.7.18
steps:
- checkout

Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:

py3:
docker:
- image: circleci/python:3.6.5
- image: cimg/python:3.6.15
steps:
- checkout

Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

mypy27:
docker:
- image: circleci/python:3.6.5
- image: cimg/python:3.6.15
steps:
- checkout

Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:

mypy3:
docker:
- image: circleci/python:3.6.5
- image: cimg/python:3.6.15
steps:
- checkout

Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:

lint:
docker:
- image: circleci/python:3.6.5
- image: cimg/python:3.6.15
steps:
- checkout

Expand Down Expand Up @@ -193,15 +193,14 @@ jobs:

publish-wheel:
docker:
- image: circleci/python:3.6.5
- image: cimg/python:3.6.15
steps:
- checkout
- deploy:
command: |
pip install --user setuptools wheel twine
python setup.py sdist bdist_wheel --universal
~/.local/bin/twine upload dist/*

~/.local/bin/twine upload --repository-url https://upload.pypi.org/legacy/ -u $PYPI_USERNAME -p $PYPI_PASSWORD dist/*
workflows:
version: 2
build:
Expand Down
2 changes: 1 addition & 1 deletion scripts/download_conjure_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARTIFACT_NAME="conjure-python-${VERSION}"
DOWNLOAD_OUTPUT="build/downloads/conjure-python.tgz"

mkdir -p build/downloads
curl -L "https://palantir.bintray.com/releases/com/palantir/conjure/python/conjure-python/${VERSION}/${ARTIFACT_NAME}.tgz" -o "$DOWNLOAD_OUTPUT"
curl -L "https://repo1.maven.org/maven2/com/palantir/conjure/python/conjure-python/${VERSION}/${ARTIFACT_NAME}.tgz" -o "$DOWNLOAD_OUTPUT"

tar xf "$DOWNLOAD_OUTPUT" -C build
rm -rf "build/conjure-python"
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_test_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ function download() {

DOWNLOAD_OUTPUT="$RESOURCES_DIR/${API}.conjure.json"
ARTIFACT_NAME="${API}-${VERSION}.conjure.json"
out=$(download "https://palantir.bintray.com/releases/com/palantir/conjure/verification/${API}/${VERSION}/${ARTIFACT_NAME}")
out=$(download "https://repo1.maven.org/maven2/com/palantir/conjure/verification/${API}/${VERSION}/${ARTIFACT_NAME}")
cp -f "$out" "$DOWNLOAD_OUTPUT"

DOWNLOAD_OUTPUT="$RESOURCES_DIR/${TEST_CASES}.json"
ARTIFACT_NAME="${TEST_CASES}-${VERSION}.json"
out=$(download "https://palantir.bintray.com/releases/com/palantir/conjure/verification/${TEST_CASES}/${VERSION}/${ARTIFACT_NAME}")
out=$(download "https://repo1.maven.org/maven2/com/palantir/conjure/verification/${TEST_CASES}/${VERSION}/${ARTIFACT_NAME}")
cp -f "$out" "$DOWNLOAD_OUTPUT"


Expand All @@ -40,6 +40,6 @@ case $(uname -s) in
esac

ARTIFACT_NAME="${SERVER}-${VERSION}-${TARGET}.tgz"
out=$(download "https://palantir.bintray.com/releases/com/palantir/conjure/verification/${SERVER}/${VERSION}/${ARTIFACT_NAME}")
out=$(download "https://repo1.maven.org/maven2/com/palantir/conjure/verification/${SERVER}/${VERSION}/${ARTIFACT_NAME}")
tar xf "$out" -C "$DOWNLOADS_DIR/bin"
chmod +x "$DOWNLOADS_DIR/bin/conjure-verification-server"