Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
heroku-buildpack-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Evili del Rio i Silvan
heroku-buildpack-python
Commits
b0f49570
Unverified
Commit
b0f49570
authored
7 years ago
by
Ian Stapleton Cordasco
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #699 from heroku/reenable-shellcheck
Let's test re-enabling shellcheck in CI
parents
af7332b5
f072b730
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+6
-9
6 additions, 9 deletions
.travis.yml
bin/compile
+5
-5
5 additions, 5 deletions
bin/compile
with
11 additions
and
14 deletions
.travis.yml
+
6
−
9
View file @
b0f49570
...
@@ -2,15 +2,12 @@ language: bash
...
@@ -2,15 +2,12 @@ language: bash
dist
:
trusty
dist
:
trusty
jobs
:
jobs
:
include
:
include
:
# - stage: "Bash linting (shellcheck)"
-
stage
:
"
Bash
linting
(shellcheck)"
# sudo: false
sudo
:
false
# addons:
before_install
:
# apt:
-
wget -c https://goo.gl/ZzKHFv -O - | tar -xvJ -C /tmp/
# sources:
-
PATH="/tmp/shellcheck-latest:$PATH"
# - debian-sid # Grab shellcheck from the Debian repo (o_O)
script
:
make check
# packages:
# - shellcheck
# script: make check
-
stage
:
"
Stack
Tests"
-
stage
:
"
Stack
Tests"
services
:
docker
services
:
docker
...
...
This diff is collapsed.
Click to expand it.
bin/compile
+
5
−
5
View file @
b0f49570
...
@@ -221,7 +221,7 @@ fi
...
@@ -221,7 +221,7 @@ fi
# Download / Install Python, from pre-build binaries available on Amazon S3.
# Download / Install Python, from pre-build binaries available on Amazon S3.
# This step also bootstraps pip / setuptools.
# This step also bootstraps pip / setuptools.
let
start
=
$(
nowms
)
((
start
=
$(
nowms
)
))
# shellcheck source=bin/steps/python
# shellcheck source=bin/steps/python
source
"
$BIN_DIR
/steps/python"
source
"
$BIN_DIR
/steps/python"
mtime
"python.install.time"
"
${
start
}
"
mtime
"python.install.time"
"
${
start
}
"
...
@@ -233,7 +233,7 @@ source "$BIN_DIR/steps/pipenv"
...
@@ -233,7 +233,7 @@ source "$BIN_DIR/steps/pipenv"
# Uninstall removed dependencies with Pip.
# Uninstall removed dependencies with Pip.
# The buildpack will automatically remove any declared dependencies (in requirements.txt)
# The buildpack will automatically remove any declared dependencies (in requirements.txt)
# that were explicitly removed. This machinery is a bit complex, but it is not complicated.
# that were explicitly removed. This machinery is a bit complex, but it is not complicated.
let
start
=
$(
nowms
)
((
start
=
$(
nowms
)
))
# shellcheck source=bin/steps/pip-uninstall
# shellcheck source=bin/steps/pip-uninstall
source
"
$BIN_DIR
/steps/pip-uninstall"
source
"
$BIN_DIR
/steps/pip-uninstall"
mtime
"pip.uninstall.time"
"
${
start
}
"
mtime
"pip.uninstall.time"
"
${
start
}
"
...
@@ -277,7 +277,7 @@ source "$BIN_DIR/steps/gdal"
...
@@ -277,7 +277,7 @@ source "$BIN_DIR/steps/gdal"
# -----------
# -----------
# Install dependencies with pip (where the magic happens).
# Install dependencies with pip (where the magic happens).
let
start
=
$(
nowms
)
((
start
=
$(
nowms
)
))
# shellcheck source=bin/steps/pip-install
# shellcheck source=bin/steps/pip-install
source
"
$BIN_DIR
/steps/pip-install"
source
"
$BIN_DIR
/steps/pip-install"
mtime
"pip.install.time"
"
${
start
}
"
mtime
"pip.install.time"
"
${
start
}
"
...
@@ -286,7 +286,7 @@ mtime "pip.install.time" "${start}"
...
@@ -286,7 +286,7 @@ mtime "pip.install.time" "${start}"
# Note: this may only work on Python 2.7. I don't think many customers use this functionality,
# Note: this may only work on Python 2.7. I don't think many customers use this functionality,
# and it should probably be undocumented.
# and it should probably be undocumented.
# (there's an import error on 3.6 that should hopefully be fixed upstream at some point)
# (there's an import error on 3.6 that should hopefully be fixed upstream at some point)
let
start
=
$(
nowms
)
((
start
=
$(
nowms
)
))
sub_env
"
$BIN_DIR
/steps/nltk"
sub_env
"
$BIN_DIR
/steps/nltk"
mtime
"nltk.download.time"
"
${
start
}
"
mtime
"nltk.download.time"
"
${
start
}
"
...
@@ -304,7 +304,7 @@ fi
...
@@ -304,7 +304,7 @@ fi
# This is the cause for the majority of build failures on the Python platform.
# This is the cause for the majority of build failures on the Python platform.
# These failures are intentional — if collectstatic (which can be tricky, at times) fails,
# These failures are intentional — if collectstatic (which can be tricky, at times) fails,
# your build fails.
# your build fails.
let
start
=
$(
nowms
)
((
start
=
$(
nowms
)
))
sub_env
"
$BIN_DIR
/steps/collectstatic"
sub_env
"
$BIN_DIR
/steps/collectstatic"
mtime
"collectstatic.time"
"
${
start
}
"
mtime
"collectstatic.time"
"
${
start
}
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment