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.

Sign up for GitHub

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

Pull in missing script changes #2546

Merged
merged 3 commits into from
Jun 5, 2018
Merged

Pull in missing script changes #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0a877d
Pull in missing script changes
janette Jun 5, 2018
43ea8de
Update changelog, add circle.conf file
janette Jun 5, 2018
aa93b57
revert circleci/config.yml change
janette Jun 5, 2018
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 .ahoy/.scripts/dkan-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
require "base64"
require "./dkan/.ahoy/.scripts/behat-parse-params"

BEHAT_FOLDER = ENV.has_key?("BEHAT_FOLDER") ? ENV["BEHAT_FOLDER"] : "docroot/profiles/dkan/test"
ALT_CONFIG_FILE = ENV.has_key?("ALT_CONFIG_FILE") ? ENV["ALT_CONFIG_FILE"] : "behat.local.yml"
BEHAT_ENV = ENV['HOSTNAME']
BEHAT_FOLDER = ENV.has_key?("BEHAT_FOLDER") && ENV["BEHAT_FOLDER"] != "" ? ENV["BEHAT_FOLDER"] : "docroot/profiles/dkan/test"
ALT_CONFIG_FILE = ENV.has_key?("ALT_CONFIG_FILE") && ENV["ALT_CONFIG_FILE"] != "" ? ENV["ALT_CONFIG_FILE"] : "behat.local.yml"
BEHAT_ENV = ENV.has_key?("HOSTNAME") && ENV["HOSTNAME"] != "" ? ENV["HOSTNAME"] : "cli"
SKIP_COMPOSER_FLAG="--skip-composer"

if File.exists? "#{BEHAT_FOLDER}/#{ALT_CONFIG_FILE}"
Expand Down
2 changes: 1 addition & 1 deletion .ahoy/dkan.ahoy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ commands:
fi

b64=`echo "payload: $input" | base64 $wrap 0`
ahoy cmd-proxy ruby dkan/.ahoy/.scripts/dkan-test.rb "$b64"
ahoy cmd-proxy BEHAT_FOLDER=$BEHAT_FOLDER ALT_CONFIG_FILE="ALT_CONFIG_FILE" ruby dkan/.ahoy/.scripts/dkan-test.rb "$b64"

unittests:
usage: Run phpunit tests
Expand Down
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,3 @@ jobs:
fi
- store_artifacts:
path: /go/src/github.com/dkan/assets

13 changes: 13 additions & 0 deletions .circleci/tests/circle/circle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<VirtualHost *:80>

UseCanonicalName Off
ServerName test.dev
DocumentRoot /home/circleci/site_build/docroot

<Directory "/home/circleci/site_build/docroot">
Options FollowSymLinks
AllowOverride All
Require all granted
</Directory>

</VirtualHost>
16 changes: 16 additions & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
7.x-1.15.1
----------
- #2533 #2546 Updates docker-compose to use updated cli container
- #2542 Add theme setting to adjust hero region height
- #2531 Add table tags to allowed html
- #2527 Stop xdebug in web and cli containers for tests
- #2521 Add custom validation rules to the REST API node creation
- #2498 Fix the link to installation info on README.md
- #2463 Update circle setup to use local DEV containers
- #2485 Check the character length of harvested resource urls
- #2476 Update getExtension() and createResources() functions
- #2452 Fix front page link paths on logo and site name
- #2489 Create variable for map tile url
- #2492 Security update for file_resup module, upgrade to version 1.5
- #2358 Fix datastore error reporting when UUID is missing

7.x-1.15
----------
- #2339 Adds a linkchecker to DKAN.
Expand Down