Skip to content

Commit

Permalink
Merge pull request #108 from afflom/spike/podman
Browse files Browse the repository at this point in the history
  • Loading branch information
estroz authored Oct 6, 2021
2 parents df490dd + cd67c89 commit 2a018ce
Show file tree
Hide file tree
Showing 5 changed files with 363 additions and 24 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ jobs:
strategy:
matrix:
go-version: [1.16.x]
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}
steps:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}
- name: Install podman
run: sudo apt-get install podman
- name: Checkout code
uses: actions/checkout@v2
- name: Build and run tests
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/RedHatGov/bundle
go 1.16

require (
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
github.com/blang/semver/v4 v4.0.0
github.com/bshuster-repo/logrus-logstash-hook v1.0.2 // indirect
github.com/containerd/containerd v1.4.8
github.com/containerd/containerd v1.5.2
github.com/containers/image/v5 v5.15.2
github.com/docker/distribution v2.7.1+incompatible
github.com/go-git/go-git/v5 v5.4.2
github.com/google/go-containerregistry v0.6.0
github.com/google/uuid v1.2.0
github.com/joelanford/ignore v0.0.0-20210610194209-63d4919d8fb2
github.com/mattn/go-sqlite3 v1.14.8 // indirect
Expand Down Expand Up @@ -39,7 +39,7 @@ require (
)

replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7
//github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7
github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20210730111815-c26349f8e2c9
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20210730111823-1570202448c3
Expand Down
Loading

0 comments on commit 2a018ce

Please sign in to comment.