Skip to content

Commit

Permalink
fix actions
Browse files Browse the repository at this point in the history
  • Loading branch information
rcannood committed Sep 4, 2024
1 parent e0c7312 commit b5dd28b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 187 deletions.
163 changes: 0 additions & 163 deletions .github/workflows/integration-test.yml

This file was deleted.

27 changes: 7 additions & 20 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:

outputs:
component_matrix: ${{ steps.set_matrix.outputs.matrix }}
cache_key: ${{ steps.cache.outputs.cache_key }}

steps:
- uses: actions/checkout@v4
Expand All @@ -28,22 +27,6 @@ jobs:
config_mod: .functionality.version := 'main_build'
parallel: true

# - name: Build nextflow schemas
# uses: viash-io/viash-actions/pro/build-nextflow-schemas@v4
# with:
# workflows: src
# components: src
# viash_pro_token: ${{ secrets.GTHB_PAT }}
# tools_version: 'main_build'

# - name: Build parameter files
# uses: viash-io/viash-actions/pro/build-nextflow-params@v4
# with:
# workflows: src
# components: src
# viash_pro_token: ${{ secrets.GTHB_PAT }}
# tools_version: 'main_build'

- name: Deploy to target branch
uses: peaceiris/actions-gh-pages@v4
with:
Expand Down Expand Up @@ -73,6 +56,10 @@ jobs:

runs-on: ubuntu-latest

permissions:
contents: read
packages: write

strategy:
fail-fast: false
matrix:
Expand All @@ -93,13 +80,13 @@ jobs:
platform: docker
src: ${{ matrix.component.dir }}
setup: build

- name: Login to container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GTHB_USER }}
password: ${{ secrets.GTHB_PAT }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push container
uses: viash-io/viash-actions/ns-build@v5
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ jobs:

runs-on: ubuntu-latest

permissions:
contents: read
packages: write

strategy:
fail-fast: false
matrix:
Expand All @@ -122,13 +126,13 @@ jobs:
platform: docker
src: ${{ matrix.component.dir }}
setup: build

- name: Login to container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GTHB_USER }}
password: ${{ secrets.GTHB_PAT }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Push container
uses: viash-io/viash-actions/ns-build@v5
Expand Down Expand Up @@ -192,7 +196,7 @@ jobs:
# phase 4
component_test:
needs: [ build, list ]
if: ${{ needs.list.outputs.matrix != '[]' && needs.list.outputs.matrix != '' }}
if: ${{ needs.list.outputs.component_matrix != '[]' && needs.list.outputs.component_matrix != '' }}
runs-on: ubuntu-latest

strategy:
Expand Down

0 comments on commit b5dd28b

Please sign in to comment.