Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge followups #92

Merged
merged 11 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/10-bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ labels: bug
assignees: ''

---
# syslog-ng
## Version of syslog-ng
# AxoSyslog
## Version of AxoSyslog
<!-- $ syslog-ng --version -->

## Platform
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/20-documentation-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---

## Documentation version
<!-- In which version of syslog-ng's documentation did you see the issue? -->
<!-- In which version of AxoSyslog's documentation did you see the issue? -->

## Incorrect section
<!-- Which section of the documentation is wrong? Please include a link to it, if that is possible. -->
Expand Down
8 changes: 4 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!--
Thank you for contributing to syslog-ng. Please make sure you:
- Read our Contribution guideline: https://github.com/syslog-ng/syslog-ng/blob/master/CONTRIBUTING.md
Thank you for contributing to AxoSyslog. Please make sure you:
- Read our Contribution guideline: https://github.com/axoflow/axosyslog/blob/main/CONTRIBUTING.md
- Checked that tests pass (including stylechecks: `make style-check`)
- Wrote a news file, if applicable: https://github.com/syslog-ng/syslog-ng/tree/master/news
- Wrote a news file, if applicable: https://github.com/axoflow/axosyslog/tree/main/news
-->


<!--
PR description
In the description, please explain the problem your pull request intends to solve, and a give general overview of the implementation.
For more information, see: https://github.com/syslog-ng/syslog-ng/blob/master/CONTRIBUTING.md#pr-description
For more information, see: https://github.com/axoflow/axosyslog/blob/main/CONTRIBUTING.md#pr-description
-->
2 changes: 1 addition & 1 deletion .github/workflows/axosyslog-create-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Extract source tarball
run: |
mkdir axosyslog
tar --strip-components=1 -xvf syslog-ng*.tar.gz -C axosyslog
tar --strip-components=1 -xvf axosyslog*.tar.gz -C axosyslog

- name: Prepare docker image
working-directory: axosyslog
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/axosyslog-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_IMAGE_NAME }}
tags: type=match,pattern=syslog-ng-(.*),group=1
tags: type=match,pattern=axosyslog-(.*),group=1
sep-tags: ','

- name: Compose Docker image tags
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/axosyslog-packages.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
# TODO rewrite rpm and deb packaging for AxoSyslog and remove this job (use "create-packages" instead)
name: AxoSyslog packages
on:
workflow_call:
inputs:
repo:
description: 'syslog-ng repository'
description: 'AxoSyslog repository'
required: true
default: 'syslog-ng/syslog-ng'
default: 'axoflow/axosyslog'
type: string
version:
description: 'syslog-ng version'
description: 'AxoSyslog version'
required: true
type: string

workflow_dispatch:
inputs:
repo:
description: 'syslog-ng repository'
description: 'AxoSyslog repository'
required: true
default: 'syslog-ng/syslog-ng'
default: 'axoflow/axosyslog'
type: string
version:
description: 'syslog-ng version'
description: 'AxoSyslog version'
required: true
type: string

jobs:
create-source-tarball:
runs-on: ubuntu-latest
steps:
- name: Get syslog-ng tarball
- name: Get AxoSyslog tarball
env:
GH_TOKEN: ${{ github.token }}
run: |
gh release download --repo '${{ inputs.repo }}' -p 'syslog-ng-${{ inputs.version }}.tar.gz' 'syslog-ng-${{ inputs.version }}'
gh release download --repo '${{ inputs.repo }}' -p 'axosyslog-${{ inputs.version }}.tar.gz' 'axosyslog-${{ inputs.version }}'

- name: Extract source tarball
run: |
mkdir syslog-ng
tar --strip-components=1 -xvf syslog-ng*.tar.gz -C syslog-ng
rm syslog-ng*.tar.gz
mkdir axosyslog
tar --strip-components=1 -xvf axosyslog*.tar.gz -C axosyslog
rm axosyslog*.tar.gz

- name: AxoSyslog patches
working-directory: syslog-ng
working-directory: axosyslog
run: |
sed -i 's/Name: syslog-ng/Name: axosyslog/' packaging/rhel/syslog-ng.spec
sed -i 's|%{name}-%{version}.tar.gz|syslog-ng-%{version}.tar.gz|' packaging/rhel/syslog-ng.spec
Expand All @@ -58,18 +59,18 @@ jobs:
cat packaging/rhel/syslog-ng.spec

- name: Prepare docker image
working-directory: syslog-ng
working-directory: axosyslog
run: ./dbld/rules cache-image-tarball

- name: Create source tarball
working-directory: syslog-ng
working-directory: axosyslog
run: ./dbld/rules pkg-tarball

- name: Store source tarball as artifact
uses: actions/upload-artifact@v4
with:
name: source-tarball
path: syslog-ng/dbld/build/*.tar.*
path: axosyslog/dbld/build/*.tar.*
if-no-files-found: error

create-packages:
Expand Down
198 changes: 0 additions & 198 deletions .github/workflows/axosyslog-snapshot-image.yml

This file was deleted.

59 changes: 0 additions & 59 deletions .github/workflows/axosyslog-stable-image.yml

This file was deleted.

Loading
Loading