Skip to content

Commit

Permalink
Merge pull request #29 from NxtLvLSoftware/dev-to-dist
Browse files Browse the repository at this point in the history
Merge dev changes to dist
  • Loading branch information
JackNoordhuis authored Sep 25, 2023
2 parents 70c4d3f + 636c972 commit d6c0976
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 29 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: CI

on:
push:
branches: [dev, dist]
branches: [dev]
pull_request:
branches: [dev]

permissions:
contents: read
Expand Down Expand Up @@ -139,7 +141,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5

if: github.ref == 'refs/heads/dev'
if: github.event_name == 'push'
steps:
- run: 'echo "Staging dev changes"'
- uses: actions/checkout@v3
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/package-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,6 @@ jobs:
timeout-minutes: 5

steps:
- name: Wait for CI success
if: github.event_name == 'push'
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: Run tests
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10

- name: Wait for example package CI success
if: github.event_name == 'push'
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: Run example package tests
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10

- name: Wait for example project CI success
if: github.event_name == 'push'
uses: lewagon/[email protected]
with:
ref: ${{ github.ref }}
check-name: Run example project tests
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10

- uses: actions/checkout@v4

- name: Use Node.js ${{ env.NODE_VERSION }}
Expand Down

0 comments on commit d6c0976

Please sign in to comment.