Skip to content

Commit

Permalink
wip: removed extra WF layer
Browse files Browse the repository at this point in the history
  • Loading branch information
levb committed Apr 22, 2024
1 parent de89dc6 commit 2b58fda
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 57 deletions.
23 changes: 0 additions & 23 deletions .github/on-pr-merged-main.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: build and test
on:
workflow_call:
inputs:
name:
type: string
default: "build and test"
arch:
type: string
default: "64"
Expand Down Expand Up @@ -57,6 +60,7 @@ defaults:
jobs:
do:
runs-on: ubuntu-${{ inputs.ubuntu_version }}
name: "${{ inputs.name }}: ubuntu-${{ inputs.ubuntu_version }} ${{ inputs.compiler }} nats:${{ inputs.server_version }}"
steps:
- name: Checkout nats.c
uses: actions/checkout@v4
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/build.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
name: build all (Debug)

on:
workflow_call:
secrets:
CODECOV_TOKEN:
required: true
COVERALLS_REPO_TOKEN:
required: true
pull_request:

permissions:
contents: write # so it can comment
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/on-push-quick.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
on:
push:

defaults:
run:
shell: bash --noprofile --norc -x -eo pipefail {0}

jobs:
quick:
strategy:
fail-fast: false
matrix:
compiler: [gcc, clang]
ubuntu_version: [latest, 20.04]
uses: ./.github/workflows/build-test.yml
name: "All: ubuntu:${{ matrix.ubuntu_version }} ${{ matrix.compiler }} nats:latest"
with:
server_version: main
ubuntu_version: ${{ matrix.ubuntu_version }}
compiler: ${{ matrix.compiler }}

Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
name: build all (Release)

on:
workflow_call:
push:
branches:
- main
- release_*


permissions:
contents: write # so it can comment
Expand Down

0 comments on commit 2b58fda

Please sign in to comment.