Skip to content

Commit

Permalink
Merge tag v13.4.2 into v14.2.x
Browse files Browse the repository at this point in the history
* submodules/beaver v0.3.3(cbce378)...v0.5.1(cee61e3) (17 commits)
  > dlang: Properly restore old shell flags
  > Pass DFLAGS from beaver to docker container
  > install: Remove temporary files on success
  > dlang install: Add support for contexts
  > beaver install: Support multiple Dockerfile contexts
  (...)
  • Loading branch information
mihails-strasuns-sociomantic committed May 25, 2018
2 parents ca93585 + 984bb15 commit 73f76b5
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 26 deletions.
63 changes: 38 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,48 @@ env:
global:
# Make sure beaver is in the PATH
- PATH="$(git config -f .gitmodules submodule.beaver.path)/bin:$PATH"
matrix:
- DMD=1.081.* DIST=xenial F=production AFTER_SCRIPT=1
- DMD=1.081.* DIST=xenial F=devel
- DMD=2.070.2.s* DIST=xenial F=production
- DMD=2.070.2.s* DIST=xenial F=devel
- DMD=2.071.2.s* DIST=xenial F=production
- DMD=2.071.2.s* DIST=xenial F=devel
- DMD=2.077.* DIST=xenial F=production
- DMD=2.077.* DIST=xenial F=devel
- DIST=xenial
- COV=1

# Don't build tags already converted to D2
if: NOT tag =~ \+d2$
# Basic config is inherited from the global scope
jobs:
templates:
- &test-matrix
stage: Test
# Don't build tags already converted to D2
if: NOT tag =~ \+d2$
after_success: beaver dlang codecov
install: beaver dlang install
script: beaver dlang make
include:
# Test matrix

install: beaver dlang install
- <<: *test-matrix
env: DMD=1.081.* F=production
- <<: *test-matrix
env: DMD=1.081.* F=devel
- <<: *test-matrix
env: DMD=2.070.2.s* F=production
- <<: *test-matrix
env: DMD=2.070.2.s* F=devel
- <<: *test-matrix
env: DMD=2.071.2.s* F=production
- <<: *test-matrix
env: DMD=2.071.2.s* F=devel
- <<: *test-matrix
env: DMD=2.077.* F=production
- <<: *test-matrix
env: DMD=2.077.* F=devel

script: beaver dlang make
# Additional stages

- stage: Closure allocation check
env: DMD=2.070.2.s* F=devel
install: beaver dlang install
script: ci/closures.sh

jobs:
include:
- stage: D2 Release
# We need to include the exclusion of D2 tags because this "if"
# replaces the global one
if: tag IS present AND NOT tag =~ \+d2$
# env: is inherited from the first matrix row, for converting code to
# D2 it doesn't matter what compiler version or F we use, it only
# matters that we have a DIST and DMD variables defined, so we just
# use whatever the first row have.
# before_install: and install: are also inherited and we don't need
# to override them.
env: DMD=2.070.2.s* F=devel
install: beaver dlang install
script: beaver dlang d2-release
# Overridden to NOP, otherwise is inherited
after_success: true
12 changes: 12 additions & 0 deletions ci/closures.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
set -xe

# Enables printing of all potential GC allocation sources to stdout
export DFLAGS=-vgc

# Prepare sources
beaver dlang make d2conv

# Ensure that there are no lines about closure allocations in the output
# Filters away errors from submodules to focus on swarm own code only
! beaver dlang make fasttest 2>&1 | grep "\./src/.*\<closure\>"

0 comments on commit 73f76b5

Please sign in to comment.