Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pypy.org
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PyPy
pypy.org
Commits
6755ce52d95d
Commit
6755ce52d95d
authored
4 years ago
by
Matti Picus
Browse files
Options
Downloads
Plain Diff
Merge branch 'branch/preview' into 'branch/default'
add a gitlab-ci runner See merge request
!21
parents
0a620f5102f9
52c3b68a4441
No related branches found
No related tags found
1 merge request
!21
add a gitlab-ci runner
Pipeline
#16020
failed
4 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+31
-0
31 additions, 0 deletions
.gitlab-ci.yml
README
+5
-1
5 additions, 1 deletion
README
with
36 additions
and
1 deletion
.gitlab-ci.yml
0 → 100644
+
31
−
0
View file @
6755ce52
stages
:
-
build
-
deploy
html-build
:
image
:
registry.heptapod.net/pypy/pypy/ci:v1
stage
:
build
script
:
-
make build
#deploy-test:
# image: registry.heptapod.net/octobus/ci-dockerfiles/ci-website
# stage: deploy
# script:
# - make build # use artefact eventually
# - netlify deploy --site=056ee9b4-122d-4b02-bf62-5a2fc9776196 --auth="$NETLIFY_AUTH_TOKEN" --dir="public"
deploy
:
# On a merge, regenerate the content and commit it to the repo
image
:
registry.heptapod.net/pypy/pypy/ci:v1
stage
:
deploy
only
:
-
branch/default
script
:
-
set -ex
-
make build
-
hg add public
-
hg commit public
-
hg push
This diff is collapsed.
Click to expand it.
README
+
5
−
1
View file @
6755ce52
...
...
@@ -8,9 +8,9 @@
using the static site generator *nikola* (https://getnikola.com/).
To change content of the pages, please change the
files in the `files` director
y
only.
files in the `files`
and `pages`
director
ies
only.
!! The content of `public` (with all helper directories, like js, css, ...)
is not written by hand,
**please do not modify** - it will be overwritten !!
...
...
@@ -12,8 +12,12 @@
!! The content of `public` (with all helper directories, like js, css, ...)
is not written by hand,
**please do not modify** - it will be overwritten !!
After you make changes, do `make build` to regenerate the pages in ``public/``
but **do not commit these**, they will be rebuilt and commited via a CI deploy
step. You can also do ``make auto`` to start a server that will serve the
pages, and rebuild them when any changes are mede ot the sources.
Remark:
...
...
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