Skip to content

Commit 1800fa9

Browse files
authored
Misc swift release (#70)
* Update deploy release secret key * Update build to ensure clean build; Release process includes info on updating travis secrets * build: Remove swift download for Linux since we now expect it in container
1 parent fed3bae commit 1800fa9

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,19 @@ deps:
4949
#$(BREWGET) swift-sh
5050

5151
build-linux: setup deps
52+
rm -f .build/release .build/debug
53+
rm -rf .build/x86*
5254
swift build -c release
5355
mkdir -p "$(LINUX_DIR)$(LINUX_PATH)/"
56+
file ".build/release/${BINARY_NAME}"
5457
cp -p ".build/release/${BINARY_NAME}" "${LINUX_BINARY}"
5558

5659
build-darwin: setup deps
60+
rm -f .build/release .build/debug
61+
rm -rf .build/x86*
5762
swift build -c release
5863
mkdir -p "$(MACOS_DIR)$(MACOS_PATH)/"
64+
file ".build/release/${BINARY_NAME}"
5965
cp -p ".build/release/${BINARY_NAME}" "${MACOS_BINARY}"
6066

6167
test:

Release-Process.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,16 @@ The following instructions are for releasing a new version of kitura-cli:
1212
- Replace the `kitura.rb` file with the one that is attached to the release.
1313
- Push your changes, then raise and merge the PR.
1414
- Update your version of the cli by running `brew upgrade kitura` and do a final check to make sure your updates are running as expected.
15+
16+
17+
### Updating release secrets
18+
19+
Travis documentation here is a bit sketchy. Follow these steps:
20+
21+
1. Generate a Github personal access token with the following scope:
22+
`read:org`, `public_repo`, `repo:status`, `repo_deployment`, `user:email`, `write:repo_hook`
23+
2. Login using `travis login <github token> --org`
24+
3. Run `echo <github token> | travis encrypt --org -r your/repo`
25+
4. Use that secret in your `.travis.yml` file as described in the documentation
26+
27+
Source: [Stack Overflow](https://stackoverflow.com/questions/25302518/travis-ci-setup-releases-with-github-token)

build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ case `uname` in
5656
test_Darwin
5757
;;
5858
Linux)
59-
TAR_FILE=swift-5.3.3-RELEASE-ubuntu18.04.tar.gz
60-
URL=https://swift.org/builds/swift-5.3.3-release/ubuntu1804/swift-5.3.3-RELEASE/${TAR_FILE}
61-
wget "${URL}"
62-
tar xzf ${TAR_FILE}
63-
export PATH="${PWD}/swift-5.3.3-RELEASE-ubuntu18.04/usr/bin/:${PATH}"
59+
#TAR_FILE=swift-5.3.3-RELEASE-ubuntu18.04.tar.gz
60+
#URL=https://swift.org/builds/swift-5.3.3-release/ubuntu1804/swift-5.3.3-RELEASE/${TAR_FILE}
61+
#wget "${URL}"
62+
#tar xzf ${TAR_FILE}
63+
#export PATH="${PWD}/swift-5.3.3-RELEASE-ubuntu18.04/usr/bin/:${PATH}"
6464

6565
make
6666
test_Linux

0 commit comments

Comments
 (0)