[whimsy] branch master updated: Fail on system() errors
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new b98b41e5 Fail on system() errors
b98b41e5 is described below
commit b98b41e5e62b81d827e6bb619f719019873b6bc5
Author: Sebb
AuthorDate: Mon Dec 5 21:45:56 2022 +
Fail on system() errors
---
Rakefile | 31 ++-
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/Rakefile b/Rakefile
index 72f955ee..359fbce8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,11 @@ def mkdir_p?(path)
mkdir_p path unless Dir.exist? path
end
+# Run system and abort if it fails
+def system!(*args)
+ system(*args) or raise "system!() failed!"
+end
+
# update gems and restart applications as needed
task :update, [:command] do |task, args|
# determine last update time of library sources
@@ -67,7 +72,7 @@ task :update, [:command] do |task, args|
gems.values
].join("\n")
File.write "Gemfile", contents
-system('bundle', 'install')
+system!('bundle', 'install') or raise "Bundler failed"
end
end
end
@@ -86,7 +91,7 @@ task :update, [:command] do |task, args|
locktime = File.mtime('Gemfile.lock') rescue Time.at(0)
bundler = 'bundle' unless File.exist?(bundler)
- system(bundler, args.command || 'update')
+ system!(bundler, args.command || 'update') or raise "Bundler failed"
# if new gems were installed and this directory contains a passenger
# application, restart it
@@ -180,12 +185,12 @@ namespace :svn do
Dir.chdir(name) {
# ensure single-threaded SVN updates
LockFile.lockfile(Dir.pwd, nil, File::LOCK_EX) do # ignore the
return parameter
- system('svn', 'cleanup')
+ system!('svn', 'cleanup')
unless isSymlink # Don't change depth for symlinks
curdepth = ASF::SVN.getInfoAsHash('.')['Depth'] || 'infinity'
# not available as separate item
if curdepth != depth
puts "#{PREFIX} update depth from '#{curdepth}' to
'#{depth}'"
- system('svn', 'update', '--set-depth', depth)
+ system!('svn', 'update', '--set-depth', depth)
end
end
outerr = nil
@@ -232,9 +237,9 @@ namespace :svn do
} # chdir
else # directory does not exist
# Don't bother locking here -- it should be very rarely needed
-system('svn', 'checkout', "--depth=#{depth}", svnpath, name)
+system!('svn', 'checkout', "--depth=#{depth}", svnpath, name)
if files
-system('svn', 'update', *files, {chdir: name})
+system!('svn', 'update', *files, {chdir: name})
end
end
# check that explicitly required files exist
@@ -325,20 +330,20 @@ namespace :git do
end
# pull changes
- system('git', 'checkout', branch) if branch
- system('git', 'fetch', 'origin')
- system('git', 'reset', '--hard', "origin/#{branch || 'master'}")
+ system!('git', 'checkout', branch) if branch
+ system!('git', 'fetch', 'origin')
+ system!('git', 'reset', '--hard', "origin/#{branch || 'master'}")
end
else
depth = description['depth']
# fresh checkout
if depth
- system('git', 'clone', '--depth', depth.to_s, (base +
description['url']).to_s, name)
+ system!('git', 'clone', '--depth', depth.to_s, (base +
description['url']).to_s, name)
else
- system('git', 'clone', (base + description['url']).to_s, name)
+ system!('git', 'clone', (base + description['url']).to_s, name)
end
-system('git', 'checkout', branch, {chdir: name}) if branch
+system!('git', 'checkout', branch, {chdir: name}) if branch
end
end
end
@@ -351,7 +356,7 @@ task :rdoc => 'www/docs/api/index.html'
file 'www/docs/api/index.html' => Rake::FileList['lib/whimsy/**/*.rb'] do
# remove old files first
FileUtils.remove_dir(File.join(File.dirname(__FILE__),'www/docs/api'))
- system('rdoc', 'lib/whimsy', '--output', 'www/docs/api', '--force-output',
+ system!('rdoc', 'lib/whimsy', '--output', 'www/docs/api', '--force-output',
'--title', 'whimsy/asf lib', {chdir: File.dirname(__FILE__)})
end
[whimsy] branch master updated: psych now needs libyaml-dev
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new 019ff22a psych now needs libyaml-dev 019ff22a is described below commit 019ff22a36f6744e74eada538f1b2888c9e3ab7d Author: Sebb AuthorDate: Mon Dec 5 21:41:09 2022 + psych now needs libyaml-dev --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index d22c7ff9..9ec2f516 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,9 @@ RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y ldap-utils COPY docker-config/puppeteer-install.sh /tmp/puppeteer-install.sh RUN bash /tmp/puppeteer-install.sh && rm /tmp/puppeteer-install.sh +# Fix for psych 5.0.0 +RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y libyaml-dev + # For testing agenda, you may need the following: # Find the chrome version: # google-chrome --version
[whimsy] branch master updated: Clarify License requirement
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new e468585c Clarify License requirement
e468585c is described below
commit e468585c94cf581b4afed74afcc65459322d13a2
Author: Sebb
AuthorDate: Mon Dec 5 21:07:37 2022 +
Clarify License requirement
---
lib/whimsy/sitestandards.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/whimsy/sitestandards.rb b/lib/whimsy/sitestandards.rb
index 772a9a29..4cb266a1 100644
--- a/lib/whimsy/sitestandards.rb
+++ b/lib/whimsy/sitestandards.rb
@@ -66,7 +66,7 @@ module SiteStandards
CHECK_VALIDATE => %r{^https?://.*apache.org/licenses/?$},
CHECK_TYPE => true,
CHECK_POLICY =>
'https://www.apache.org/foundation/marks/pmcs#navigation',
- CHECK_DOC => 'There should be a "License" navigation link which points
to: http[s]://www.apache.org/licenses[/]',
+ CHECK_DOC => 'There should be a "License" (*not* "Licenses") navigation
link which points to: http[s]://www.apache.org/licenses[/]. (Do not link to
sub-pages)',
},
'thanks' => { # link_check a_text =~ /\A(sponsors|thanks!?|thanks to our
sponsors)\z/
CHECK_TEXT => /\A(sponsors|thanks!?|thanks to our sponsors)\z/,
[whimsy] branch master updated: Configure LDAP for setup
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new b31925a3 Configure LDAP for setup b31925a3 is described below commit b31925a30c1d4a6451a3370ea45dabdd85b3c75b Author: Sebb AuthorDate: Mon Dec 5 20:57:02 2022 + Configure LDAP for setup --- .github/workflows/unittestnavigation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unittestnavigation.yml b/.github/workflows/unittestnavigation.yml index 5ae47ea1..0530460b 100644 --- a/.github/workflows/unittestnavigation.yml +++ b/.github/workflows/unittestnavigation.yml @@ -40,6 +40,7 @@ jobs: - name: Set up LDAP run: | # need to run the ruby that has all the gems installed +echo ":ldap: ldaps://ldap-us.apache.org:636" >> .whimsy sudo $(which ruby) -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure" - name: test agenda navigation code run: |
[whimsy] branch master updated: Trying to fix ruby installation issue
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new 2a221b19 Trying to fix ruby installation issue 2a221b19 is described below commit 2a221b197442adbf27799d3946f1693383fd7584 Author: Sebb AuthorDate: Mon Dec 5 20:51:51 2022 + Trying to fix ruby installation issue --- .github/workflows/unittestnavigation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestnavigation.yml b/.github/workflows/unittestnavigation.yml index 22e5015a..5ae47ea1 100644 --- a/.github/workflows/unittestnavigation.yml +++ b/.github/workflows/unittestnavigation.yml @@ -19,7 +19,8 @@ jobs: run: | sudo apt-get install libldap2-dev sudo apt-get install libsasl2-dev - if: matrix.os == 'ubuntu-20.04' +sudo apt-get install libyaml-dev # psych 5.0.0 + if: matrix.os == 'ubuntu-20.04' - uses: actions/setup-node@v2 with: node-version: '14.19.1'
[whimsy] branch master updated: Trying to fix ruby installation issue
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new b933904b Trying to fix ruby installation issue b933904b is described below commit b933904b9fea8048f81825d0d737e7a91275588f Author: Sebb AuthorDate: Mon Dec 5 20:46:38 2022 + Trying to fix ruby installation issue --- .github/workflows/unittestagenda.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index ecd5789a..e68153c7 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -29,7 +29,8 @@ jobs: sudo apt-get update sudo apt-get install libldap2-dev sudo apt-get install libsasl2-dev - if: matrix.os != 'macos-latest' +sudo apt-get install libyaml-dev # seems to be needed for installing ruby since psych 5.0.0 release + if: matrix.os != 'macos-latest' # - uses: actions/setup-node@v2 # with: # node-version: '14.19.1'
[whimsy] branch master updated: apt-get not on macos
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new 1f9a1737 apt-get not on macos 1f9a1737 is described below commit 1f9a1737ff25e3f0a433fda658c5b50b87298269 Author: Sebb AuthorDate: Mon Dec 5 20:38:27 2022 + apt-get not on macos --- .github/workflows/unittestlib.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/unittestlib.yml b/.github/workflows/unittestlib.yml index fd672388..155a18ee 100644 --- a/.github/workflows/unittestlib.yml +++ b/.github/workflows/unittestlib.yml @@ -28,10 +28,8 @@ jobs: sudo apt-get update sudo apt-get install libldap2-dev sudo apt-get install libsasl2-dev +sudo apt-get install libyaml-dev # seems to be needed for installing ruby since psych 5.0.0 release if: matrix.os != 'macos-latest' -- name: setup # seems to be needed for installing ruby since psych 5.0.0 release - run: | -sudo apt-get install libyaml-dev - uses: actions/checkout@v2 with: persist-credentials: false
[whimsy] branch master updated: Trying to fix ruby installation issue
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new 0cb8eb4c Trying to fix ruby installation issue 0cb8eb4c is described below commit 0cb8eb4c7e7a6fbda08c6b13349948477c3338d6 Author: Sebb AuthorDate: Mon Dec 5 20:34:56 2022 + Trying to fix ruby installation issue --- .github/workflows/unittestlib.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/unittestlib.yml b/.github/workflows/unittestlib.yml index 20a47082..fd672388 100644 --- a/.github/workflows/unittestlib.yml +++ b/.github/workflows/unittestlib.yml @@ -29,6 +29,9 @@ jobs: sudo apt-get install libldap2-dev sudo apt-get install libsasl2-dev if: matrix.os != 'macos-latest' +- name: setup # seems to be needed for installing ruby since psych 5.0.0 release + run: | +sudo apt-get install libyaml-dev - uses: actions/checkout@v2 with: persist-credentials: false
