Skip to content

Commit

Permalink
Merge branch 'main' into jbe/docs_test_release
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelkins committed Dec 1, 2023
2 parents 1434cb3 + 88779ff commit 1853baa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/generate-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
if [[ $GITHUB_REF == refs/tags/* ]]; then
echo "Tagged release"
# get last part of GITHUB_REF separated by /
VERSION=$(echo $GITHUB_REF | tr '/' '\n' | tail -1)
VERSION=`echo $GITHUB_REF | tr '/' '\n' | tail -1`
echo "Version: $VERSION"
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
else
echo "Error: runs on a tag only"
exit(1)
exit 1
fi
- name: Generate docs
run: |
Expand Down
7 changes: 4 additions & 3 deletions scripts/codegen.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash
#!/bin/bash

# Stop on any failed step of this script
set -eo pipefail

# Regenerates the SDK. For use during development only.
# Arguments passed into this script are passed on to the manifest generator.

# May be used on Mac or Linux.
# When run on Mac, kills Xcode before codegen & restarts it after.
Expand All @@ -28,9 +29,9 @@ rm -rf Tests/Services/*
# Merge the newly built models
./scripts/mergeModels.sh Sources/Services

# Regenerate the package manifest and doc index
# Regenerate the package manifest and doc index, with args passed into this script
cd AWSSDKSwiftCLI
swift run AWSSDKSwiftCLI generate-package-manifest ..
swift run AWSSDKSwiftCLI generate-package-manifest "$@" ..
swift run AWSSDKSwiftCLI generate-doc-index ..
cd ..

Expand Down

0 comments on commit 1853baa

Please sign in to comment.