Skip to content
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

Update download link and SHASUM for version 2.25.0 of the CLI #1107

Merged
merged 2 commits into from
Mar 30, 2020
Merged

Update download link and SHASUM for version 2.25.0 of the CLI #1107

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
6c32422
Update download link and SHASUM for version 2.25.0 of the CLI
designatednerd Mar 30, 2020
46ef941
Add a note about trying SPM codegen wrapper
designatednerd Mar 30, 2020
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
2 changes: 1 addition & 1 deletion Sources/ApolloCodegenLib/CLIDownloader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct CLIDownloader {
}

/// The URL string for getting the current version of the CLI
static let downloadURLString = "https://41516-65563448-gh.circle-artifacts.com/0/oclif-pack/apollo-v2.22.1/apollo-v2.22.1-darwin-x64.tar.gz"
static let downloadURLString = "https://44151-65563448-gh.circle-artifacts.com/0/oclif-pack/apollo-v2.25.0/apollo-v2.25.0-darwin-x64.tar.gz"

/// Downloads the appropriate Apollo CLI in a zip file.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/ApolloCodegenLib/CLIExtractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct CLIExtractor {
}
}

static let expectedSHASUM = "bf98280b7164fbb2cd6fa04a9e7869d59798b9717ebee7650c365b920f566c59"
static let expectedSHASUM = "5224c3788d0a131483bd1ed640444e0b1becf3ab33e9ce4aef6b0579bd4d7712"

/// Checks to see if the CLI has already been extracted and is the correct version, and extracts or re-extracts as necessary
///
Expand Down
7 changes: 5 additions & 2 deletions scripts/run-bundled-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
# Exit on all errors, undeclared variables and pipefailures.
set -euo pipefail

# Advertisement!
echo "Have you tried our new Swift Package Manager wrapper around codegen? It's now available in beta! See docs at https://www.apollographql.com/docs/ios/swift-scripting/. Note that when this comes out of beta, this Bash script will be deprecated, so give it a try today!"

# Get the path to the script directory
SCRIPT_DIR="$(dirname "$0")"

# Get the SHASUM of the tarball
ZIP_FILE="${SCRIPT_DIR}/apollo.tar.gz"
ZIP_FILE_DOWNLOAD_URL="https://41516-65563448-gh.circle-artifacts.com/0/oclif-pack/apollo-v2.22.1/apollo-v2.22.1-darwin-x64.tar.gz"
ZIP_FILE_DOWNLOAD_URL="https://44151-65563448-gh.circle-artifacts.com/0/oclif-pack/apollo-v2.25.0/apollo-v2.25.0-darwin-x64.tar.gz"
SHASUM_FILE="${SCRIPT_DIR}/apollo/.shasum"
APOLLO_DIR="${SCRIPT_DIR}"/apollo
IS_RETRY="false"
Expand Down Expand Up @@ -55,7 +58,7 @@ extract_cli() {

validate_codegen_and_extract_if_needed() {
# Make sure the SHASUM matches the release for this version
EXPECTED_SHASUM="bf98280b7164fbb2cd6fa04a9e7869d59798b9717ebee7650c365b920f566c59"
EXPECTED_SHASUM="5224c3788d0a131483bd1ed640444e0b1becf3ab33e9ce4aef6b0579bd4d7712"
update_shasum

if [[ ${SHASUM} = ${EXPECTED_SHASUM}* ]]; then
Expand Down