Skip to content

Commit 160072f

Browse files
authored
Merge branch 'master' into toycalc
2 parents 5cfd893 + ddd5ed9 commit 160072f

File tree

3 files changed

+61
-8
lines changed

3 files changed

+61
-8
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,15 @@ jobs:
130130
runs-on: ubuntu-latest
131131

132132
steps:
133-
- uses: actions/checkout@v1.2.0
133+
- uses: actions/checkout@v2
134134
- name: Build Docker image
135-
run: |
136-
docker build . \
137-
--file docker/Dockerfile \
138-
--build-arg BASE_IMAGE=python:3.7-slim \
139-
--tag pyhf/pyhf:$GITHUB_SHA \
140-
--compress
141-
docker images
135+
if: "!(startsWith(github.ref, 'refs/tags/'))"
136+
uses: docker/build-push-action@v1
137+
with:
138+
repository: pyhf/pyhf
139+
dockerfile: docker/Dockerfile
140+
tag_with_sha: true
141+
tag_with_ref: true
142+
push: false
143+
- name: List built images
144+
run: docker images

.github/workflows/publish-docker.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Publish Docker Images
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*
9+
10+
jobs:
11+
build-and-publish:
12+
name: Build and publish Docker images to Docker Hub
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@master
17+
- name: Build and Publish to Registry
18+
if: "!(startsWith(github.ref, 'refs/tags/'))"
19+
uses: docker/build-push-action@v1
20+
with:
21+
username: ${{ secrets.DOCKER_USERNAME }}
22+
password: ${{ secrets.DOCKER_PASSWORD }}
23+
repository: pyhf/pyhf
24+
dockerfile: docker/Dockerfile
25+
tags: latest
26+
- name: Build and Publish to Registry with Release Tag
27+
if: startsWith(github.ref, 'refs/tags/')
28+
uses: docker/build-push-action@v1
29+
with:
30+
username: ${{ secrets.DOCKER_USERNAME }}
31+
password: ${{ secrets.DOCKER_PASSWORD }}
32+
repository: pyhf/pyhf
33+
dockerfile: docker/Dockerfile
34+
tags: latest,latest-stable
35+
tag_with_ref: true

docs/bib/use_citations.bib

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
@article{Abdallah:2020pec,
2+
author = "Abdallah, Waleed and others",
3+
title = "{Reinterpretation of LHC Results for New Physics: Status
4+
and Recommendations after Run 2}",
5+
collaboration = "LHC Reinterpretation Forum",
6+
year = "2020",
7+
eprint = "2003.07868",
8+
archivePrefix = "arXiv",
9+
primaryClass = "hep-ph",
10+
reportNumber = "CERN-LPCC-2020-001, FERMILAB-FN-1098-CMS-T,
11+
Imperial/HEP/2020/RIF/01",
12+
SLACcitation = "%%CITATION = ARXIV:2003.07868;%%",
13+
journal = ""
14+
}
15+
116
@inproceedings{Brooijmans:2020yij,
217
author = "Brooijmans, G. and others",
318
title = "{Les Houches 2019 Physics at TeV Colliders: New Physics

0 commit comments

Comments
 (0)