Skip to content

Commit

Permalink
Merge pull request #42 from miniben-90/issue-40
Browse files Browse the repository at this point in the history
[FIX] Issue with CI/CD
  • Loading branch information
miniben-90 authored Nov 20, 2024
2 parents da6ed69 + aae1da8 commit 0a48a3a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci-napi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@ on:
tags:
- "napi-*.*.*"
- "napi-v*.*.*"
# tags-ignore:
# - '**'
paths-ignore:
- '**/*.md'
- LICENSE
- '**/*.gitignore'
- .editorconfig
- docs/**
pull_request: null
release:
types: [published]
# release:
# types: [published]

jobs:
build:
Expand Down Expand Up @@ -325,7 +323,7 @@ jobs:
if-no-files-found: error

publish:
if: ${{ github.event_name == 'release' && github.ref_type == 'tag' && startsWith(github.ref_name, 'napi-') }}
if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(github.ref_name, 'napi-') }}
name: Publish ${{ github.ref_name }} (${{ github.ref }})
runs-on: ubuntu-latest
env:
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/ci-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,15 @@ on:
tags:
- "rust-*.*.*"
- "rust-v*.*.*"
# tags-ignore:
# - "**"
paths-ignore:
- "**/*.md"
- LICENSE
- "**/*.gitignore"
- .editorconfig
- docs/**
pull_request: null
release:
types: [published]
# release:
# types: [published]

jobs:
build-n-test:
Expand Down Expand Up @@ -147,7 +145,7 @@ jobs:
if-no-files-found: error

publish:
if: ${{ github.event_name == 'release' && github.ref_type == 'tag' && startsWith(github.ref_name, 'rust-') }}
if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(github.ref_name, 'rust-') }}
defaults:
run:
working-directory: ${{ github.workspace }}/x-win-rs
Expand Down Expand Up @@ -175,7 +173,7 @@ jobs:
toolchain: stable

- name: Install cargo-bump
run: cargo install bump
run: cargo install cargo-bump

- name: Generate version from ${{ github.ref_name }}
run: |
Expand Down

0 comments on commit 0a48a3a

Please sign in to comment.