Skip to content

Commit

Permalink
Merge branch 'master' into release24-1
Browse files Browse the repository at this point in the history
  • Loading branch information
nr23730 committed Jan 18, 2024
2 parents 75b7721 + 5f483f3 commit d37df4f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
permissions:
packages: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- name: Build dev containers
run: docker-compose -f compose-dev.yml build cbioportal
- name: Build dev cbioproxy
run: docker-compose -f compose-dev.yml build cbioproxy
- name: Login to Docker registry
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-research.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4

- name: Build research containers
run: docker-compose -f compose-research.yml build cbioportal
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4

- name: Build care cBioPortal
run: docker-compose -f compose.yml build cbioportal
Expand Down

0 comments on commit d37df4f

Please sign in to comment.