Skip to content

Commit

Permalink
Merge branch 'master' into toycalc
Browse files Browse the repository at this point in the history
  • Loading branch information
kratsg authored Mar 27, 2020
2 parents 5cfd893 + ddd5ed9 commit 160072f
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 8 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v2
- name: Build Docker image
run: |
docker build . \
--file docker/Dockerfile \
--build-arg BASE_IMAGE=python:3.7-slim \
--tag pyhf/pyhf:$GITHUB_SHA \
--compress
docker images
if: "!(startsWith(github.ref, 'refs/tags/'))"
uses: docker/build-push-action@v1
with:
repository: pyhf/pyhf
dockerfile: docker/Dockerfile
tag_with_sha: true
tag_with_ref: true
push: false
- name: List built images
run: docker images
35 changes: 35 additions & 0 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Publish Docker Images

on:
push:
branches:
- master
tags:
- v*

jobs:
build-and-publish:
name: Build and publish Docker images to Docker Hub
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Build and Publish to Registry
if: "!(startsWith(github.ref, 'refs/tags/'))"
uses: docker/build-push-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: pyhf/pyhf
dockerfile: docker/Dockerfile
tags: latest
- name: Build and Publish to Registry with Release Tag
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: pyhf/pyhf
dockerfile: docker/Dockerfile
tags: latest,latest-stable
tag_with_ref: true
15 changes: 15 additions & 0 deletions docs/bib/use_citations.bib
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
@article{Abdallah:2020pec,
author = "Abdallah, Waleed and others",
title = "{Reinterpretation of LHC Results for New Physics: Status
and Recommendations after Run 2}",
collaboration = "LHC Reinterpretation Forum",
year = "2020",
eprint = "2003.07868",
archivePrefix = "arXiv",
primaryClass = "hep-ph",
reportNumber = "CERN-LPCC-2020-001, FERMILAB-FN-1098-CMS-T,
Imperial/HEP/2020/RIF/01",
SLACcitation = "%%CITATION = ARXIV:2003.07868;%%",
journal = ""
}

@inproceedings{Brooijmans:2020yij,
author = "Brooijmans, G. and others",
title = "{Les Houches 2019 Physics at TeV Colliders: New Physics
Expand Down

0 comments on commit 160072f

Please sign in to comment.