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.

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

Remove references to travis/, move to scripts/ #527

Merged
merged 1 commit into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
git config user.email "jaegertracingbot+jaeger-tracing@googlegroups.com"
# git config credential.helper "store --file=.git/credentials"
# echo "https://${{ secrets.JAEGERTRACINGBOT_GITHUB_TOKEN }}" > .git/credentials
export TRAVIS_TAG=${GITHUB_REF##*/}
./travis/release.sh
export RELEASE_TAG=${GITHUB_REF##*/}
./scripts/release.sh

- name: GH CLI create PR
run: |
Expand All @@ -35,4 +35,4 @@ jobs:
git push origin gen-release-${TAG} # branch has to be on remote before PR is opened
gh pr create --base master --title "Release ${TAG}" --body "Release ${TAG}. This PR is created from CI and is part of the release process."
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ TODO: shouldn't the tag only specify major/minor, not patch? I don't think the p

### Auto-generated documentation for CLI flags

The docs for the Jaeger CLI tools are generated by the automated release process described above using the Python script [`travis/gen-cli-data.py`](./travis/gen-cli-data.py). It uses the configuration file `data/cli/next-release/config.json` (automatically copied to `data/cli/${NEXT_VERSION}/config.json`) that describes which Jaeger binaries to include in the documentation, and which storage options each binary supports. The script invokes the `docs` command on the respective Docker images for each binary and creates a set of YAML files under `data/cli/${NEXT_VERSION}/`, which are then used by the template engine to render the CLI docs.
The docs for the Jaeger CLI tools are generated by the automated release process described above using the Python script [`scripts/gen-cli-data.py`](./scripts/gen-cli-data.py). It uses the configuration file `data/cli/next-release/config.json` (automatically copied to `data/cli/${NEXT_VERSION}/config.json`) that describes which Jaeger binaries to include in the documentation, and which storage options each binary supports. The script invokes the `docs` command on the respective Docker images for each binary and creates a set of YAML files under `data/cli/${NEXT_VERSION}/`, which are then used by the template engine to render the CLI docs.

File renamed without changes.
10 changes: 5 additions & 5 deletions travis/release.sh → scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ safe_checkout_master() {
fi
}

if [[ "$TRAVIS_TAG" =~ ^release-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+?$ ]]; then
echo "We are on release-x.y.z tag: $TRAVIS_TAG"
if [[ "$RELEASE_TAG" =~ ^release-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+?$ ]]; then
echo "We are on release-x.y.z tag: $RELEASE_TAG"
safe_checkout_master
version=$(echo "${TRAVIS_TAG}" | sed 's/^release-//')
version=$(echo "${RELEASE_TAG}" | sed 's/^release-//')
versionMajorMinor=$(echo "${version}" | sed 's/\.[[:digit:]]$//')
echo "Creating new documentation for ${version}"
cp -r ./content/docs/next-release/ ./content/docs/${versionMajorMinor}
Expand All @@ -34,7 +34,7 @@ if [[ "$TRAVIS_TAG" =~ ^release-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+?$ ]]; t
mkdir -p ${cliDocsTempDir}/data/cli
cp -r ./data/cli/next-release/ ${cliDocsTempDir}/data/cli/${versionMajorMinor}
chmod a+w -R ${cliDocsTempDir}
python ./travis/gen-cli-data.py ${versionMajorMinor} ${cliDocsTempDir}
python ./scripts/gen-cli-data.py ${versionMajorMinor} ${cliDocsTempDir}
mv ${cliDocsTempDir}/data/cli/${versionMajorMinor} ./data/cli/
sed -i -e "s/latest *=.*$/latest = \"${versionMajorMinor}\"/" config.toml
sed -i -e "s/binariesLatest *=.*$/binariesLatest = \"${version}\"/" config.toml
Expand All @@ -46,6 +46,6 @@ if [[ "$TRAVIS_TAG" =~ ^release-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+?$ ]]; t
git add config.toml ./content/docs/${versionMajorMinor} ./data/cli/${versionMajorMinor}
git commit -m "Release ${version}" -s
else
echo "TRAVIS_TAG=$TRAVIS_TAG is not in the form release-x.y.z, skipping release"
echo "RELEASE_TAG=$RELEASE_TAG is not in the form release-x.y.z, skipping release"
exit 1
fi