update for buildv2

This commit is contained in:
Brett Kelly 2025-02-24 16:08:51 -04:00
parent cf7910c196
commit 92b0358fdf
15 changed files with 248 additions and 82 deletions

View File

@ -2,40 +2,83 @@ name: Build Packages
on:
push:
branches:
- build-package
- main
tags:
- 'v*.*.*'
jobs:
main:
runs-on: self-hosted
prebuild:
runs-on: buildinator-group
outputs:
manifest: ${{ steps.prebuild.outputs.manifest }}
matrix: ${{ steps.prebuild.outputs.matrix }}
uuid: ${{ steps.prebuild.outputs.uuid }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Package Binaries
run: build-packages ${{github.repository}} ${{github.workspace}}
- name: Set Variables
if: startsWith(github.ref, 'refs/tags/')
run: |
echo "PRERELEASE=$(cat ${{github.workspace}}/manifest.json | jq --raw-output '.prerelease')" >> $GITHUB_ENV
echo "TITLE=$(cat ${{github.workspace}}/manifest.json | jq --raw-output '.title')" >> $GITHUB_ENV
echo "VERSION=$(cat ${{github.workspace}}/manifest.json | jq --raw-output '.version')" >> $GITHUB_ENV
echo "REVISION=$(cat ${{github.workspace}}/manifest.json | jq --raw-output '.buildVersion')" >> $GITHUB_ENV
- name: GitHub Release
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@v1
uses: actions/checkout@v3
- id: prebuild
name: Prebuild flow
uses: 45drives/actions/prebuild-flow@main
with:
name: ${{env.TITLE}} ${{env.VERSION}}
prerelease: ${{env.PRERELEASE}}
body_path: ${{github.workspace}}/CHANGELOG.md
files: |
${{github.workspace}}/dist/packages/*/*.deb
${{github.workspace}}/dist/packages/*/*.rpm
${{github.workspace}}/LICENSE
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Update Repository
directory: ${{ github.workspace }}
build:
needs: prebuild
runs-on: buildinator-group
strategy:
matrix:
build: ${{ fromJSON(needs.prebuild.outputs.matrix).include }}
steps:
- name: Build package
uses: 45drives/actions/build-package@main
with:
manifest: ${{ needs.prebuild.outputs.manifest }}
build: ${{ toJSON(matrix.build) }}
uuid: ${{ needs.prebuild.outputs.uuid }}
sign:
needs:
- prebuild
- build
runs-on: buildinator-group
steps:
- name: Run sign playbook
uses: 45drives/actions/ansible-playbook@main
with:
playbook: /root/git/auto-packaging/actions/ansible/sign.yml
directory: ${{ github.workspace }}/packaging
group_vars_directory: ${{ github.workspace }}/packaging/group_vars/
inventory: |
[ci]
localhost
become: true
host_key_checking: true
extra_vars: sign_key_name=prod
update_repositories:
needs:
- prebuild
- build
- sign
runs-on: buildinator-group
steps:
- id: push_local
name: Push packages into local repository
uses: 45drives/actions/update-repo@main
with:
directory: ${{ github.workspace }}
sync_repositories:
needs:
- prebuild
- build
- sign
- update_repositories
runs-on: buildinator-group
steps:
- id: push_remote
name: Sync local repository with remote repository
if: startsWith(github.ref, 'refs/tags/')
run: update-repositories ${{github.workspace}}
- name: Publish Repository
if: startsWith(github.ref, 'refs/tags/')
run: publish-repo
uses: 45drives/actions/sync-repo@main
with:
directory: ${{ github.workspace }}

View File

@ -1,28 +1,24 @@
{
"__version": "45D-R1",
"schema_version": "45D_AP_V2.0",
"name": "cockpit-navigator",
"title": "Cockpit Navigator",
"prerelease": false,
"description": "A File System Browser for Cockpit.",
"version": "0.5.10",
"buildVersion": "1",
"build_number": "1",
"stable": true,
"author": "Josh Boudreau <jboudreau@45drives.com>",
"url": "https://github.com/45Drives/cockpit-navigator",
"category": "utils",
"priority": "optional",
"licence": "GPL-3.0+",
"architecture": {
"deb": "all",
"el": "noarch"
},
"description": {
"long": "A File System Browser for Cockpit.",
"short": "A File System Browser for Cockpit."
},
"git_url": "https://github.com/45Drives/cockpit-navigator",
"license": "GPL-3.0+",
"defaults": {
"urgency": "medium"
},
"architecture": {
"rocky": "x86_64",
"debian": "amd64",
"ubuntu": "amd64"
},
"dependencies": {
"deb": [
"ubuntu_common": [
"cockpit",
"python3",
"rsync",
@ -30,7 +26,7 @@
"file",
"coreutils"
],
"el": [
"rocky_common": [
"cockpit",
"python3",
"rsync",
@ -40,23 +36,32 @@
"/bin/rmdir"
]
},
"releases": [
"builds": [
{
"image": "ubuntu-focal-builder",
"codeName": "focal",
"type": "deb"
"group": "ubuntu",
"os_name": "ubuntu-focal",
"image": "ci.cr.45d.io/ci/simple/ubuntu-focal:1"
},
{
"image": "rocky-el8-builder",
"codeName": "el8",
"type": "el"
"group": "ubuntu",
"os_name": "ubuntu-jammy",
"image": "ci.cr.45d.io/ci/simple/ubuntu-jammy:1"
},
{
"image": "centos-el7-builder",
"codeName": "el7",
"type": "el"
"group": "rocky",
"os_name": "rocky-el8",
"image": "ci.cr.45d.io/ci/simple/rocky-el8:1"
},
{
"group": "rocky",
"os_name": "rocky-el9",
"image": "ci.cr.45d.io/ci/simple/rocky-el9:1"
}
],
"repos": [
"community",
"enterprise"
],
"changelog": {
"urgency": "medium",
"version": "0.5.10",

View File

@ -1,12 +0,0 @@
Source: ::package_name::
Section: ::package_category::
Priority: ::package_priority::
Maintainer: ::package_author::
Build-Depends: debhelper-compat (= 12)
Standards-Version: 4.4.1
Homepage: ::package_url::
Package: ::package_name::
Architecture: ::package_architecture_deb::
Depends: ::package_dependencies_deb::
Description: ::package_description_short::

View File

@ -1,20 +1,21 @@
%global debug_package %{nil}
Name: ::package_name::
Version: ::package_version::
Release: ::package_build_version::%{?dist}
Summary: ::package_description_short::
License: ::package_licence::
URL: ::package_url::
Name: {{ name }}
Version: {{ version }}
Release: {{ build_number }}%{?dist}
Summary: {{ description }}
License: {{ license }}
URL: {{ git_url }}
Source0: %{name}-%{version}.tar.gz
BuildArch: ::package_architecture_el::
Requires: ::package_dependencies_el::
BuildArch: {{ architecture.rocky }}
Requires: {{ dependencies.rocky_common | join(',') }}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
::package_title::
::package_description_long::
{{ title }}
{{ description }}
%prep
%setup -q

View File

@ -0,0 +1,37 @@
%global debug_package %{nil}
Name: {{ name }}
Version: {{ version }}
Release: {{ build_number }}%{?dist}
Summary: {{ description }}
License: {{ license }}
URL: {{ git_url }}
Source0: %{name}-%{version}.tar.gz
BuildArch: {{ architecture.rocky }}
Requires: {{ dependencies.rocky_common | join(',') }}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
{{ title }}
{{ description }}
%prep
%setup -q
%build
# empty
%install
make DESTDIR=%{buildroot} DIST=%{dist} NAV_VERS="%{version}-%{release}" install
%clean
rm -rf %{buildroot}
%files
/usr/share/cockpit/navigator/*
%changelog
* Mon Feb 24 2025 Brett Kelly <bkelly@45drives.com> 0.5.10-1
- build for el9

View File

@ -0,0 +1,13 @@
Source: {{ name }}
Section: utils
Priority: optional
Maintainer: {{ author }}
Build-Depends: debhelper-compat (= 12)
Standards-Version: 4.4.1
Homepage: {{ git_url }}
Vcs-Git: {{ git_url }}
Package: {{ name }}
Architecture: {{ architecture.ubuntu }}
Depends: {{ dependencies.ubuntu_common | join(',') }}
Description: {{ description }}

View File

@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ::package_name::
Upstream-Contact: ::package_author::
Source: ::package_url::
Upstream-Name: "{{ name }}"
Upstream-Contact: "{{ author }}"
Source: "{{ git_url }}"
Files: *
Copyright: 2021 Josh Boudreau <jboudreau@45drives.com>

View File

@ -0,0 +1,5 @@
cockpit-navigator (0.5.10-1jammy) jammy; urgency=medium
* build for jammy
-- Brett Kelly <bkelly@45drives.com> Mon, 24 Feb 2025 14:40:50 -0300

View File

@ -0,0 +1,13 @@
Source: {{ name }}
Section: utils
Priority: optional
Maintainer: {{ author }}
Build-Depends: debhelper-compat (= 12)
Standards-Version: 4.4.1
Homepage: {{ git_url }}
Vcs-Git: {{ git_url }}
Package: {{ name }}
Architecture: {{ architecture.ubuntu }}
Depends: {{ dependencies.ubuntu_common | join(',') }}
Description: {{ description }}

View File

@ -0,0 +1,35 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: "{{ name }}"
Upstream-Contact: "{{ author }}"
Source: "{{ git_url }}"
Files: *
Copyright: 2021 Josh Boudreau <jboudreau@45drives.com>
License: GPL-3.0+
Files: navigator/navigator.*
Copyright: 2021 Sam Silver <ssilver@45drives.com>
License: GPL-3.0+
Files: navigator/navigator.js
Copyright: 2021 Dawson Della Valle <ddellavalle@45drives.com>
License: GPL-3.0+
Files: debian/*
Copyright: 2021 Josh Boudreau <jboudreau@45drives.com>
License: GPL-3.0+
License: GPL-3.0+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with the Onboard package. If not, please have a look at
/usr/share/common-licenses or <http://www.gnu.org/licenses/>.

25
packaging/ubuntu-jammy/rules Executable file
View File

@ -0,0 +1,25 @@
#!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
#export DH_VERBOSE = 1
# see FEATURE AREAS in dpkg-buildflags(1)
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# see ENVIRONMENT in dpkg-buildflags(1)
# package maintainers to append CFLAGS
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export NAV_VERS := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ':')
%:
dh $@
# dh_make generated override targets
# This is example for Cmake (See https://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)

View File

@ -0,0 +1 @@
3.0 (native)