Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 56ae12c

Browse files
committed
Fix OSX seq: illegal option -- -
1 parent bedc1e5 commit 56ae12c

File tree

3 files changed

+33
-9
lines changed

3 files changed

+33
-9
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,30 @@ Note image ids also change after scm-source.json has being updated which trigger
77
###### To get container versions
88
docker exec grid versions
99

10+
## TBD_DOCKER_TAG
11+
+ Date: TBD_DATE
12+
+ Fix OSX seq: illegal option -- -
13+
+ Image tag details:
14+
+ Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
15+
+ Chrome stable: TBD_CHROME_STABLE
16+
+ Firefox stable: TBD_FIREFOX_STABLE
17+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
18+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
19+
+ Timezone: TBD_TIME_ZONE
20+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
21+
+ Python: TBD_PYTHON_VERSION
22+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
23+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
24+
+ Tested on kernel dev host: 4.4.0-31-generic x86_64
25+
+ Tested on kernel CI host: TBD_HOST_UNAME
26+
+ Built at dev host with: Docker version 1.12.0-rc4, build e4a0dbc
27+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
28+
+ Built at dev host with: Docker Compose version 1.8.0-rc2, build c72c966
29+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
30+
+ Image size: TBD_IMAGE_SIZE
31+
+ Digest: TBD_DIGEST
32+
+ Image ID: TBD_IMAGE_ID
33+
1034
## 2.53.1m
1135
+ Date: 2016-07-18
1236
+ Bugs: Makefile OSX fixes & discourage wmctrl

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ For pull requests or local commits:
88
open ./images/grid_console.png #to verify the versions are correct
99
git checkout ./images/grid_console.png && open ./videos/chrome/*.mkv
1010
travis lint #if you changed .travis.yml
11-
git checkout -b tmp-2.53.1m #name your branch according to your changes
11+
git checkout -b tmp-2.53.1n #name your branch according to your changes
1212
#git add ... git commit ... git push ... open pull request
1313

1414
For repository owners only:
1515

16-
git commit -m "Makefile OSX fixes & discourage wmctrl"
16+
git commit -m "Fix OSX seq: illegal option -- -"
1717
git tag -d latest #tag latest will be updated from TravisCI
18-
git tag 2.53.1m && git push origin tmp-2.53.1m && git push --tags
18+
git tag 2.53.1n && git push origin tmp-2.53.1n && git push --tags
1919

2020
-- Wait for Travis to pass OK
2121
-- Make sure changes got merged into master by elgalubot
2222

23-
git checkout master && git pull && git branch -d tmp-2.53.1m && git push origin --delete tmp-2.53.1m
23+
git checkout master && git pull && git branch -d tmp-2.53.1n && git push origin --delete tmp-2.53.1n
2424

2525
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2626
-- If Chrome version changed upload:
@@ -36,9 +36,9 @@ Keep certain bins if chrome version changed for example:
3636
## Retry
3737
Failed in Travis? retry
3838

39-
git tag -d 2.53.1m && git push origin :2.53.1m
39+
git tag -d 2.53.1n && git push origin :2.53.1n
4040
#git add ...
41-
git commit --amend && git tag 2.53.1m && git push --force origin tmp-2.53.1m && git push --tags
41+
git commit --amend && git tag 2.53.1n && git push --force origin tmp-2.53.1n && git push --tags
4242

4343
## Docker push from Travis CI
4444
Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# make chrome=3 firefox=5
44
# note is destructive, firsts `compose down`
55
# warns if your service is not listed in the `docker-compose.yml`
6-
# make cleanup
6+
# make down
77
#
88
# All in one
99
# make setup compose chrome=3 firefox=5 see browser=firefox node=5
@@ -173,7 +173,7 @@ down:
173173
--remove-orphans
174174

175175
stop_videos:
176-
@for node in $(shell seq --separator ' ' 1 ${tot_nodes}); do \
176+
@for node in $(shell seq -s ' ' 1 ${tot_nodes}); do \
177177
docker exec "${proj}_${browser}_$$node" stop-video \
178178
>./mk/stop_video_${browser}_$$node.log || true ; \
179179
done
@@ -203,7 +203,7 @@ move: check_wmctrl
203203

204204
gather_videos:
205205
mkdir -p ./videos
206-
@for node in $(shell seq --separator ' ' 1 ${tot_nodes}); do \
206+
@for node in $(shell seq -s ' ' 1 ${tot_nodes}); do \
207207
docker exec "${proj}_${browser}_$$node" stop-video \
208208
>./mk/stop_video_${browser}_$$node.log || true ; \
209209
docker cp "${proj}_${browser}_$$node:/videos/." videos ; \

0 commit comments

Comments
 (0)