Skip to content

Commit

Permalink
Merge branch 'cygporter' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
me-and committed Jan 19, 2023
2 parents 5ad39f2 + cfc7f06 commit f8c6e5f
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 117 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build, test, release
on: [push, pull_request]
jobs:
build-test:
uses: ./.github/workflows/build.yml

prep-release:
if: github.ref == format('refs/heads/v{0}', needs.build-test.outputs.pv)
needs: build-test
permissions:
contents: write
uses: ./.github/workflows/prepare-release.yml
with:
publish: true

release:
if: github.ref == format('refs/heads/v{0}', needs.build-test.outputs.pv)
needs: [build-test, prep-release]
uses: ./.github/workflows/release.yml
with:
release_tag: ${{ needs.prep-release.outputs.release_tag }}
secrets:
maintainer_key: ${{ secrets.maintainer_key }}
10 changes: 10 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Build
on:
- workflow_dispatch
- workflow_call
jobs:
build-test:
uses: cygporter/workflows/.github/workflows/build-test.yml@v1
with:
cygport_file: asciidoc.cygport
bootstrap_packages: cygport python3
115 changes: 0 additions & 115 deletions .github/workflows/ci.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Prepare release
on:
workflow_dispatch:
inputs:
release_tag:
description: Name for the release tag
required: false
default: ''
type: string
publish:
description: Whether to publish the release
required: false
default: false
type: boolean
workflow_call:
inputs:
release_tag:
description: Name for the release tag
required: false
default: ''
type: string
publish:
description: Whether to publish the release
required: false
default: false
type: boolean
permissions:
contents: write
jobs:
prep-release:
uses: cygporter/workflows/.github/workflows/prep-release.yml@v1
with:
cygport_file: asciidoc.cygport
release_tag: ${{ inputs.release_tag }}
publish: ${{ inputs.publish }}
bootstrap_packages: cygport python3
28 changes: 28 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Release
on:
workflow_dispatch:
inputs:
release_tag:
description: Name of the release tag
required: true
type: string
workflow_call:
inputs:
release_tag:
description: Name of the release tag
required: true
type: string
secrets:
maintainer_key:
description: RSA private key for uploading to Cygwin servers in OpenSSH format
required: true

jobs:
release:
uses: cygporter/workflows/.github/workflows/release.yml@v1
with:
cygport_file: asciidoc.cygport
tag_name: ${{ inputs.release_tag }}
bootstrap_packages: cygport python3
secrets:
maintainer_key: ${{ secrets.maintainer_key }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ The canonical version of this repository is [on GitHub][GitHub repo]. Releases
Please [contact the Cygwin mailing list][Cygwin lists] in the first instance
with any issues / questions / thoughts / &c.

[AsciiDoc]: https://asciidoc.org/
[AsciiDoc]: https://asciidoc-py.github.io/
[Cygwin]: https://www.cygwin.com/
[Cygwin lists]: https://cygwin.com/lists.html
[GitHub repo]: https://github.com/me-and/Cygwin-AsciiDoc
[GitHub repo]: https://github.com/cygporter/AsciiDoc
[Cygwin repo]: https://cygwin.com/git-cygwin-packages/?p=git/cygwin-packages/asciidoc.git

0 comments on commit f8c6e5f

Please sign in to comment.