Skip to content

Commit

Permalink
bundle: Upgrade selenium-webdriver, upgrade CI config
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTom authored and eins78 committed Dec 7, 2015
1 parent c32999b commit c37daf7
Show file tree
Hide file tree
Showing 21 changed files with 383 additions and 266 deletions.
4 changes: 0 additions & 4 deletions .cider-ci.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .cider-ci/jobs/code-check.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .cider-ci/jobs/tests-jruby.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .cider-ci/jobs/tests-mri.yml

This file was deleted.

145 changes: 0 additions & 145 deletions .cider-ci/shared/tests-context.yml

This file was deleted.

15 changes: 9 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.5.5)
childprocess (0.5.7)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.3)
cider_ci-rspec_support (1.0.3)
Expand Down Expand Up @@ -130,7 +130,7 @@ GEM
faraday_middleware (0.9.1)
faraday (>= 0.7.4, < 0.10)
fast_gettext (0.9.0)
ffi (1.9.6)
ffi (1.9.10)
flay (2.5.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
Expand Down Expand Up @@ -203,7 +203,7 @@ GEM
mime-types (1.25.1)
mini_portile (0.6.1)
minitest (5.4.3)
multi_json (1.10.1)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-ldap (0.9.0)
Expand Down Expand Up @@ -298,7 +298,7 @@ GEM
rspec-support (3.1.2)
ruby_parser (3.1.3)
sexp_processor (~> 4.1)
rubyzip (1.1.6)
rubyzip (1.1.7)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
sass (3.2.12)
Expand All @@ -307,7 +307,7 @@ GEM
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
selenium-webdriver (2.44.0)
selenium-webdriver (2.48.1)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
Expand Down Expand Up @@ -353,7 +353,7 @@ GEM
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.5)
websocket (1.2.1)
websocket (1.2.2)
websocket-driver (0.4.0)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand Down Expand Up @@ -439,3 +439,6 @@ DEPENDENCIES
uuidtools
zencoder (~> 2.4)
zencoder-fetcher

BUNDLED WITH
1.10.6
12 changes: 12 additions & 0 deletions bin/bundle_with_cachestamp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
set -e
set -u
BUNLDE_VERSION_DIGEST=`git hash-object 'Gemfile.lock'`
BUNDLE_CACHE_STAMP_FILE="/tmp/MADEK_BUNDLED_${BUNLDE_VERSION_DIGEST}_${RBENV_VERSION}"
if [ -e "$BUNDLE_CACHE_STAMP_FILE" ]; then
echo "BUNDLE_CACHE_STAMP_FILE ${BUNDLE_CACHE_STAMP_FILE} exists, doing nothing"
else
echo "bundling..."
bundle
echo "bundled $(date)" >> "$BUNDLE_CACHE_STAMP_FILE"
fi
7 changes: 7 additions & 0 deletions cider-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
jobs:

_cider-ci_include:
- cider-ci/jobs/all_tests.yml
- cider-ci/jobs/feature-tests.yml
- cider-ci/jobs/unit-tests.yml

5 changes: 5 additions & 0 deletions cider-ci/bin/check-if-branch-current
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -exu

# check if your tree still contains the current commit from master
git rev-list --children HEAD | grep -q "$(git rev-parse origin/HEAD)"
8 changes: 8 additions & 0 deletions cider-ci/bin/check-if-linear-history
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -exu

# starting point of linear history: <https://github.com/Madek/madek-webapp/commit/cc569ffc2e7b2504e548649f4b0739dfeaad8f89>
START_POINT="cc569ffc2e7b2504e548649f4b0739dfeaad8f89"

# expect no merges between start and now
test -z $(git rev-list --merges $START_POINT..HEAD)
24 changes: 24 additions & 0 deletions cider-ci/bin/check-if-submodules-current
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash
set -exu

# like `check-if-branch-current`, but for all the submodules, recursive.

# make sure all submodules are checked out
# WARNING: test is false-positive without this:
git submodule update --init --recursive

# <git ✨>
# the lowercase variables come from git
# lines explained in order:
# - go to superproject (for this level of recursion)
# - get current commit from remote master
# - get current commit of submodule in current commit from remote master
# - go to the submodule
# - check that the current submodule commit is still contained in tree
git submodule foreach --recursive '\
cd "${toplevel}" \
&& SUPER_HASH="$(git rev-parse origin/HEAD)" \
&& SUB_HASH=$(git rev-parse ${SUPER_HASH}:${path}) \
&& cd "${path}" \
&& git rev-list --children HEAD | grep -q "^${SUB_HASH}"'
# </git ✨>
Loading

0 comments on commit c37daf7

Please sign in to comment.