From 2b63aa8cd7faf49021d56175dab4a0328cbd2676 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Tue, 15 Apr 2025 23:31:40 +0300 Subject: [PATCH 01/21] Some minor lint fixes from PVS-Studio, added Alt workflow --- .gitea/workflows/alt.yaml | 53 +++++++++++++++++ rpm/bforce.spec | 50 ++++++++++------ source/Makefile.in | 14 ++++- source/bforce/daemon.c | 3 + source/bforce/daemon_lines.c | 13 ++--- source/bforce/expression.tab.c | 104 ++++++++++++++++----------------- source/bforce/freq_proc.c | 2 +- source/bforce/io_tcpip.c | 8 +-- source/configure.in | 2 +- 9 files changed, 163 insertions(+), 86 deletions(-) create mode 100644 .gitea/workflows/alt.yaml diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml new file mode 100644 index 0000000..e321bb4 --- /dev/null +++ b/.gitea/workflows/alt.yaml @@ -0,0 +1,53 @@ +name: Altlinux build +run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀 +on: + - push + - workflow_dispatch +if: ${{ github.ref }} == 'refs/head/master' +jobs: + build-arch: + runs-on: alt-latest + + branches: + - 'master' + + steps: + - name: Checking environment + continue-on-error: true + run: printenv + - name: Installing prerequisites - update pacman + run: apt-get update + - name: Installing prerequisites - install nodejs for actions & git + run: apt-get install git nodejs + - name: Installing build environment + continue-on-error: true + run: | + apt-get install gcc rpm-build rpmlint make python gear hasher patch rpmdevtools + - name: Installing needed software + run: apt-get install bison tcl + - name: Fetching sources + uses: actions/checkout@v4 + - name: Getting version info + run: | + echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV + - name: Compressing source to tar.gz archive + run: | + tar -cvzf ./bforce-${{ env.BFORCE_VER }}.tar.gz -c ${{ env.GITHUB_WORKSPACE }} + cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ./ + sed -i 's/^# %setup/%setup/' bforce.spec + - name: Building buildtree + run: | + rpmdev-setuptree + mv ./bforce-${{ env.BFORCE_VER }}.tar.gz ./rpmbuild/SOURCES/ + - name: Building binary and source RPM + rpmbuild -bb ./bforce.spec --define "_topdir $( pwd )/rpmbuild" + - name: Constructing artifact name and version + run: | + echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV + - name: Retrieving artifact files + run: mkdir bforce && cp /builder/bforce-*.pkg.tar.zst bforce + - name: Try to upload artifacts + uses: actions/upload-artifact@v3 + with: + name: bforce-${{ env.BFORCE_VER }}-Arch + path: bforce diff --git a/rpm/bforce.spec b/rpm/bforce.spec index c080cdf..0f438da 100644 --- a/rpm/bforce.spec +++ b/rpm/bforce.spec @@ -1,54 +1,66 @@ Summary: Bforce, Fidonet mailer Name: bforce Version: 0.26.1 -Release: 0 +Release: %{_vendor}.1 Copyright: GPL Group: Fidonet/mailer -Source0: bforce-%{version}.%{release}.tar.gz +Source0: bforce-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root %description BFORCE is a FTN mailer. Supports PSTN and binkp sessions. %prep -#%setup -q -n %{name}-%{version}.%{release} -cd source -./configure --prefix=/usr --disable-log-passwd --sysconfdir=/etc/bforce --bindir=/usr/bin --with-owner=uucp --with-group=news +# uncomment this to build from tarball +# %setup -q -n %{name} +echo "------------ PREPARING RPM BUILD IN $(pwd) ------------" +export RPM_PACKAGE_VERSION=$(cat %{_builddir}/%{name}/source/.version) +cd %{_builddir}/%{name}/source +%{_builddir}/%{name}/source/configure --prefix=/usr --disable-log-passwd --sysconfdir=/etc/bforce --bindir=/usr/bin --with-owner=uucp --with-group=news CFLAGS='-g1' %build -cd source +echo "------------ BUILDING RPM IN $(pwd) ------------" +cd %{_builddir}/%{name}/source make %install rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/bforce mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/sbin +mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 mkdir -p $RPM_BUILD_ROOT/var/log/bforce mkdir -p $RPM_BUILD_ROOT/var/spool/fido/bt/pin mkdir -p $RPM_BUILD_ROOT/var/spool/fido/bt/in mkdir -p $RPM_BUILD_ROOT/var/spool/fido/ndl mkdir -p $RPM_BUILD_ROOT/var/spool/fido/bforce +mkdir -p $RPM_BUILD_ROOT/$RPM_DOC_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION -install -o uucp -g news source/bin/bforce $RPM_BUILD_ROOT/usr/bin/bforce -install -o uucp -g news source/bin/bfindex $RPM_BUILD_ROOT/usr/bin/bfindex -install -o uucp -g news source/bin/bfstat $RPM_BUILD_ROOT/usr/bin/bfstat -install -o uucp -g news source/bin/nlookup $RPM_BUILD_ROOT/usr/bin/nlookup -install -o uucp -g news examples/bforce.conf $RPM_BUILD_ROOT/etc/bforce/bforce.conf.sample -install -o uucp -g news examples/bforce.passwd $RPM_BUILD_ROOT/etc/bforce/bforce.passwd.sample -install -o uucp -g news examples/bforce.subst $RPM_BUILD_ROOT/etc/bforce/bforce.subst.sample -install -o uucp -g news examples/freq.aliases $RPM_BUILD_ROOT/etc/bforce/freq.aliases.sample -install -o uucp -g news examples/freq.dirs $RPM_BUILD_ROOT/etc/bforce/freq.dirs.sample -install -m755 -o uucp -g news contrib/outman $RPM_BUILD_ROOT/usr/bin/outman - +install %{_builddir}/%{name}/source/bin/bforce $RPM_BUILD_ROOT/usr/bin/bforce +install %{_builddir}/%{name}/source/bin/bfindex $RPM_BUILD_ROOT/usr/bin/bfindex +install %{_builddir}/%{name}/source/bin/bfstat $RPM_BUILD_ROOT/usr/bin/bfstat +install %{_builddir}/%{name}/source/bin/nlookup $RPM_BUILD_ROOT/usr/bin/nlookup +install %{_builddir}/%{name}/examples/bforce.conf $RPM_BUILD_ROOT/etc/bforce/bforce.conf.sample +install %{_builddir}/%{name}/examples/bforce.passwd $RPM_BUILD_ROOT/etc/bforce/bforce.passwd.sample +install %{_builddir}/%{name}/examples/bforce.subst $RPM_BUILD_ROOT/etc/bforce/bforce.subst.sample +install %{_builddir}/%{name}/examples/freq.aliases $RPM_BUILD_ROOT/etc/bforce/freq.aliases.sample +install %{_builddir}/%{name}/examples/freq.dirs $RPM_BUILD_ROOT/etc/bforce/freq.dirs.sample +install %{_builddir}/%{name}/contrib/outman $RPM_BUILD_ROOT/usr/bin/outman +cp %{_builddir}/%{name}/man/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/ +cp %{_builddir}/%{name}/{README.md,CHANGES,COPYING,INSTALL,INSTALL.ru,SYSLOG,TODO} $RPM_BUILD_ROOT/$RPM_DOC_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION/ %clean rm -rf $RPM_BUILD_ROOT %files -%doc README README.kst CHANGES CHANGES.kst CHANGES.ugenk COPYING INSTALL.ru README.ugenk SYSLOG TODO +%{_mandir}/man1/bforce.1.xz +%{_mandir}/man1/bfindex.1.xz +%{_mandir}/man1/bfstat.1.xz +%{_mandir}/man1/nlookup.1.xz +%{_mandir}/man1/outman.1.xz %defattr(-, root, root) %attr(550,uucp,news) /usr/bin/bforce @@ -56,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT %attr(550,uucp,news) /usr/bin/bfstat %attr(550,uucp,news) /usr/bin/nlookup %attr(550,uucp,news) /usr/bin/outman -%attr(644,root,root) /usr/share/doc/bforce/* +%attr(644,root,root) /usr/share/doc/bforce-%{version}/* %dir %attr(770,uucp,news) /var/log/bforce %dir %attr(770,uucp,news) /var/spool/fido/ndl %attr(775,uucp,news) /var/spool/fido/bt diff --git a/source/Makefile.in b/source/Makefile.in index 7ba8e25..742b2b4 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -13,13 +13,14 @@ CC = @CC@ INCLUDES = -I./include CFLAGS = @CFLAGS@ -fno-builtin LIBS = @LIBS@ @CLOCK_LIB@ -YACC = @YACC@ +YACC = @YACC@ -l INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ SRCDIR = @srcdir@ SRCDIRCONF = $(SRCDIR)/../examples CONTRIBDIR = $(SRCDIR)/../contrib +CONTRIBMAN = $(SRCDIR)/../man OWNER = @OWNER@ GROUP = @GROUP@ @@ -27,6 +28,7 @@ CONFDIR = @sysconfdir@ BINDIR = @bindir@ LOGDIR = @LOGDIR@ SPOOLDIR = @SPOOLDIR@ +MANDIR = @MANDIR@ DAEMON_LOGFILE = $(LOGDIR)/bf-daemon BFORCE_LOGFILE = $(LOGDIR)/bf-log @@ -175,6 +177,7 @@ installdirs: if [ ! -d $(SPOOLDIR)/bt/out ]; then mkdir -p $(SPOOLDIR)/bt/out; fi if [ ! -d $(SPOOLDIR)/ndl ]; then mkdir -p $(SPOOLDIR)/ndl; fi if [ ! -d $(SPOOLDIR)/bforce ]; then mkdir -p $(SPOOLDIR); fi + if [ ! -d $(MANDIR)/man1 ]; then mkdir -p $(MANDIR)/man1; fi chown $(OWNER):$(GROUP) $(CONFDIR) chown $(OWNER):$(GROUP) $(LOGDIR) chown $(OWNER):$(GROUP) $(SPOOLDIR)/bt/in @@ -195,10 +198,17 @@ install-config: $(INSTALL_DATA) -o $(OWNER) -g $(GROUP) $(SRCDIRCONF)/bforce.passwd $(CONFDIR)/bforce.passwd.sample $(INSTALL_DATA) -o $(OWNER) -g $(GROUP) $(SRCDIRCONF)/freq.aliases $(CONFDIR)/freq.aliases.sample $(INSTALL_DATA) -o $(OWNER) -g $(GROUP) $(SRCDIRCONF)/freq.dirs $(CONFDIR)/freq.dirs.sample + +install-man: + $(INSTALL) $(CONTRIBMAN)/bforce.1 $(MANDIR)/man1/bforce.1 + $(INSTALL) $(CONTRIBMAN)/bfindex.1 $(MANDIR)/man1/bfindex.1 + $(INSTALL) $(CONTRIBMAN)/bfstat.1 $(MANDIR)/man1/bforce.1 + $(INSTALL) $(CONTRIBMAN)/nlookup.1 $(MANDIR)/man1/bforce.1 + $(INSTALL) $(CONTRIBMAN)/outman.1 $(MANDIR)/man1/bforce.1 install-contrib: $(INSTALL_PROGRAM) -o $(OWNER) -g $(GROUP) $(CONTRIBDIR)/outman $(BINDIR)/outman @echo "Please, edit $(BINDIR)/outman" -install: install-bin install-config +install: install-bin install-config install-man diff --git a/source/bforce/daemon.c b/source/bforce/daemon.c index dfd706e..fc9ff6e 100644 --- a/source/bforce/daemon.c +++ b/source/bforce/daemon.c @@ -810,6 +810,7 @@ int daemon_pidfile(int cmd) res = fscanf(pf, "%d", &hispid); if (res != 1) { log("daemon pidfile: not readable"); + fclose(pf); return -1; } @@ -854,6 +855,7 @@ int daemon_pidfile(int cmd) res = fscanf(pf, "%d", &hispid); if (res != 1) { log("daemon pidfile: not readable"); + fclose(pf); return -1; } @@ -883,6 +885,7 @@ int daemon_pidfile(int cmd) res = fscanf(pf, "%d", &hispid); if (res != 1) { log("daemon pidfile: not readable"); + fclose(pf); return -1; } diff --git a/source/bforce/daemon_lines.c b/source/bforce/daemon_lines.c index 470448a..e421864 100644 --- a/source/bforce/daemon_lines.c +++ b/source/bforce/daemon_lines.c @@ -32,7 +32,7 @@ int daemon_line_add(const char *name, int type) int i; for( i = 0; i < lines_num; i++ ) - if( !strcmp(lines_tab[i].name, name) ) + if( (lines_tab) && !strcmp(lines_tab[i].name, name) ) return i; log("register new line \"%s\"", name); @@ -90,13 +90,12 @@ bool daemon_line_isready(const char *name) void daemon_lines_deinit(void) { int i; - - for( i = 0; i < lines_num; i++ ) - if( lines_tab[i].name ) - free(lines_tab[i].name); - - if( lines_tab ) + if( lines_tab ) { + for( i = 0; i < lines_num; i++ ) + if( lines_tab[i].name ) + free(lines_tab[i].name); + free(lines_tab); lines_tab = NULL; } diff --git a/source/bforce/expression.tab.c b/source/bforce/expression.tab.c index 13f154b..36ead6c 100644 --- a/source/bforce/expression.tab.c +++ b/source/bforce/expression.tab.c @@ -67,7 +67,7 @@ /* First part of user prologue. */ -#line 49 "expression.y" + #include "includes.h" #include "confread.h" @@ -110,7 +110,7 @@ static int yyparse(void); static int yyerror(const char *s); -#line 114 "expression.tab.c" + # ifndef YY_CAST # ifdef __cplusplus @@ -1225,25 +1225,25 @@ yyreduce: switch (yyn) { case 2: /* fullline: expression */ -#line 94 "expression.y" + { DEB((D_EVENT, "[yacc] expression return %d", yyvsp[0])); expr_result = yyvsp[0]; } -#line 1231 "expression.tab.c" + break; case 3: /* expression: elemexp */ -#line 100 "expression.y" + { DEB((D_EVENT, "[yacc] elemexp return %d", yyvsp[0])); yyval = yyvsp[0]; } -#line 1240 "expression.tab.c" + break; case 4: /* expression: NOT expression */ -#line 105 "expression.y" + { DEB((D_EVENT, "[yacc] not exprression %d", yyvsp[0])); if( (yyvsp[0]) < 0 ) @@ -1251,190 +1251,190 @@ yyreduce: else yyval = !(yyvsp[0]); } -#line 1252 "expression.tab.c" + break; case 5: /* expression: expression LOGOP expression */ -#line 113 "expression.y" + { yyval = expr_check_logic(yyvsp[-2], yyvsp[-1], yyvsp[0]); } -#line 1260 "expression.tab.c" + break; case 6: /* expression: OPENB expression CLOSEB */ -#line 117 "expression.y" + { DEB((D_EVENT, "eventexp: [yacc] backeted.expr %d", yyvsp[-1])); yyval = yyvsp[-1]; } -#line 1269 "expression.tab.c" + break; case 7: /* elemexp: INCOMING */ -#line 123 "expression.y" + { yyval = expr_check_incoming(); } -#line 1277 "expression.tab.c" + break; case 8: /* elemexp: OUTGOING */ -#line 127 "expression.y" + { yyval = expr_check_outgoing(); } -#line 1285 "expression.tab.c" + break; case 9: /* elemexp: LISTED */ -#line 131 "expression.y" + { yyval = expr_check_listed(); } -#line 1293 "expression.tab.c" + break; case 10: /* elemexp: PROTECTED */ -#line 135 "expression.y" + { yyval = expr_check_protected(); } -#line 1301 "expression.tab.c" + break; case 11: /* elemexp: FLAG flagstring */ -#line 139 "expression.y" + { yyval = yyvsp[0]; } -#line 1309 "expression.tab.c" + break; case 12: /* elemexp: CONNSPEED AROP NUMBER */ -#line 143 "expression.y" + { if( state.valid && state.connspeed > 0 ) yyval = expr_check_arop(state.connspeed, yyvsp[-1], yyvsp[0]); else yyval = -1; } -#line 1320 "expression.tab.c" + break; case 13: /* elemexp: SPEED AROP NUMBER */ -#line 150 "expression.y" + { if( state.valid && state.node.speed > 0 ) yyval = expr_check_arop(state.node.speed, yyvsp[-1], yyvsp[0]); else yyval = -1; } -#line 1331 "expression.tab.c" + break; case 14: /* elemexp: TZ AROP NUMBER */ -#line 157 "expression.y" + { yyval = expr_check_arop(time_gmtoffset(), yyvsp[-1], yyvsp[0]); } -#line 1339 "expression.tab.c" + break; case 15: /* elemexp: PHONE TEXT */ -#line 161 "expression.y" + { yyval = expr_check_phone(expr_p_text); } -#line 1347 "expression.tab.c" + break; case 16: /* elemexp: TIME timestring */ -#line 165 "expression.y" + { yyval = yyvsp[0]; } -#line 1355 "expression.tab.c" + break; case 17: /* elemexp: EXEC TEXT */ -#line 169 "expression.y" + { yyval = expr_check_exec(expr_p_text); } -#line 1363 "expression.tab.c" + break; case 18: /* elemexp: EXIST TEXT */ -#line 173 "expression.y" + { yyval = expr_check_exist(expr_p_text); } -#line 1371 "expression.tab.c" + break; case 19: /* elemexp: PORT TEXT */ -#line 177 "expression.y" + { yyval = expr_check_port(expr_p_text); } -#line 1379 "expression.tab.c" + break; case 20: /* elemexp: MAILER TEXT */ -#line 181 "expression.y" + { yyval = expr_check_mailer(expr_p_text); } -#line 1387 "expression.tab.c" + break; case 21: /* elemexp: TEXT */ -#line 185 "expression.y" + { yyval = expr_check_addr(expr_p_text); if( yyval == -2 ) YYABORT; } -#line 1397 "expression.tab.c" + break; case 22: /* flagstring: TEXT */ -#line 192 "expression.y" + { yyval = expr_check_flag(expr_p_text); } -#line 1405 "expression.tab.c" + break; case 23: /* flagstring: TEXT COMMA flagstring */ -#line 196 "expression.y" + { yyval = expr_check_logic(yyvsp[-2], OR, yyvsp[0]); } -#line 1413 "expression.tab.c" + break; case 24: /* timestring: TEXT */ -#line 201 "expression.y" + { yyval = expr_check_time(expr_p_text); if( yyval == -2 ) YYABORT; } -#line 1423 "expression.tab.c" + break; case 25: /* timestring: TEXT COMMA timestring */ -#line 207 "expression.y" + { yyval = expr_check_logic(yyvsp[-2], OR, yyvsp[0]); } -#line 1431 "expression.tab.c" + break; -#line 1435 "expression.tab.c" + default: break; } @@ -1627,7 +1627,7 @@ yyreturnlab: return yyresult; } -#line 211 "expression.y" + #include "expression_lex.c" diff --git a/source/bforce/freq_proc.c b/source/bforce/freq_proc.c index 06e57f4..6249dc1 100644 --- a/source/bforce/freq_proc.c +++ b/source/bforce/freq_proc.c @@ -115,7 +115,7 @@ static void req_readfrlist(char *fname, s_frlist **frlist, int magic) (*ptrl) = (s_frlist*)xmalloc(sizeof(s_frlist)); memset(*ptrl, '\0', sizeof(s_frlist)); - if( path && *path ) (*ptrl)->path = xstrcpy(path); + if( *path ) (*ptrl)->path = xstrcpy(path); if( !magic && *(path + strlen(path) - 1) != DIRSEPCHR ) { /* add trailing DIRSEP ('/' or ..) to paths */ diff --git a/source/bforce/io_tcpip.c b/source/bforce/io_tcpip.c index 38f3145..06758ae 100644 --- a/source/bforce/io_tcpip.c +++ b/source/bforce/io_tcpip.c @@ -19,7 +19,7 @@ #define DEFAULT_PORT 60179 /* Birthday .. mother fucker :) */ -struct addrinfo *ai = NULL; +struct addrinfo *paddrinfo = NULL; static RETSIGTYPE tcpip_interrupt(int sig) { @@ -171,7 +171,7 @@ int tcpip_connect(const char *hostname, e_tcpmode tcpmode) //aihints.ai_socktype = SOCK_STREAM; aihints.ai_protocol = IPPROTO_TCP; - nameres = getaddrinfo ( host, port, &aihints, &ai ); + nameres = getaddrinfo ( host, port, &aihints, &paddrinfo ); if ( nameres != 0 ) { rc = 1; @@ -208,10 +208,10 @@ int tcpip_connect(const char *hostname, e_tcpmode tcpmode) if( host ) { free(host); host = NULL; } DEB((D_INFO, "tcpip_connect: resolver got result!")); - aisave = ai; + aisave = paddrinfo; if (rc == 0 ) - rc = tcpip_connect2(ai); + rc = tcpip_connect2(paddrinfo); freeaddrinfo( aisave ); diff --git a/source/configure.in b/source/configure.in index 16fd356..017523d 100644 --- a/source/configure.in +++ b/source/configure.in @@ -3,7 +3,7 @@ dnl dnl $Id$ dnl #AC_INIT(bforce/bforce.c) -AC_INIT([bforce],[0.24.1],[zx@zxalexis.ru]) +AC_INIT([bforce],[0.26.1],[zx@zxalexis.ru]) AC_CONFIG_HEADER(include/config.h) AC_CANONICAL_SYSTEM dnl # Minimum Autoconf version required. -- 2.47.2 From 6612f8fc895a39bb1bad2fe6063516898ffb5e79 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Tue, 15 Apr 2025 23:40:27 +0300 Subject: [PATCH 02/21] alt-wf 1 --- .gitea/workflows/alt.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index e321bb4..75af2fc 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -32,9 +32,9 @@ jobs: echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV - name: Compressing source to tar.gz archive run: | - tar -cvzf ./bforce-${{ env.BFORCE_VER }}.tar.gz -c ${{ env.GITHUB_WORKSPACE }} - cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ./ - sed -i 's/^# %setup/%setup/' bforce.spec + tar -cvzf ./bforce-${{ env.BFORCE_VER }}.tar.gz -c ${{ env.GITHUB_WORKSPACE }} + cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ./ + sed -i 's/^# %setup/%setup/' bforce.spec - name: Building buildtree run: | rpmdev-setuptree -- 2.47.2 From 416c79b63779e914cbbab9018a5c96d7fda2b7a5 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:04:40 +0300 Subject: [PATCH 03/21] alt-wf 2 --- .gitea/workflows/alt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 75af2fc..18367a8 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -5,7 +5,7 @@ on: - workflow_dispatch if: ${{ github.ref }} == 'refs/head/master' jobs: - build-arch: + build-alt: runs-on: alt-latest branches: -- 2.47.2 From be3fcc0b5e5eb1190b14384dc0a5f6318bbeec24 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:06:22 +0300 Subject: [PATCH 04/21] alt-wf 3 --- .gitea/workflows/alt.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 18367a8..402e6cd 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -40,6 +40,7 @@ jobs: rpmdev-setuptree mv ./bforce-${{ env.BFORCE_VER }}.tar.gz ./rpmbuild/SOURCES/ - name: Building binary and source RPM + run: | rpmbuild -bb ./bforce.spec --define "_topdir $( pwd )/rpmbuild" - name: Constructing artifact name and version run: | -- 2.47.2 From 46dc91c446b8debe466d83bb7058ab2792524a89 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:12:50 +0300 Subject: [PATCH 05/21] alt-wf 4 --- .gitea/workflows/alt.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 402e6cd..f2bdde0 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -18,13 +18,13 @@ jobs: - name: Installing prerequisites - update pacman run: apt-get update - name: Installing prerequisites - install nodejs for actions & git - run: apt-get install git nodejs + run: apt-get install -y git nodejs - name: Installing build environment continue-on-error: true run: | - apt-get install gcc rpm-build rpmlint make python gear hasher patch rpmdevtools + apt-get install -y gcc rpm-build rpmlint make python gear hasher patch rpmdevtools - name: Installing needed software - run: apt-get install bison tcl + run: apt-get install -y bison tcl - name: Fetching sources uses: actions/checkout@v4 - name: Getting version info -- 2.47.2 From 81bbffb3120e45a0a556d4f994472a798acac4df Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:20:04 +0300 Subject: [PATCH 06/21] alt-wf 5 --- .gitea/workflows/alt.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index f2bdde0..40af039 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -15,7 +15,7 @@ jobs: - name: Checking environment continue-on-error: true run: printenv - - name: Installing prerequisites - update pacman + - name: Installing prerequisites - update apt run: apt-get update - name: Installing prerequisites - install nodejs for actions & git run: apt-get install -y git nodejs @@ -29,19 +29,19 @@ jobs: uses: actions/checkout@v4 - name: Getting version info run: | - echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV + echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)" >> $GITHUB_ENV - name: Compressing source to tar.gz archive run: | - tar -cvzf ./bforce-${{ env.BFORCE_VER }}.tar.gz -c ${{ env.GITHUB_WORKSPACE }} - cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ./ - sed -i 's/^# %setup/%setup/' bforce.spec + tar -cvzf ./bforce-${{ env.BFORCE_VER }}.tar.gz -c ${{ env.GITHUB_WORKSPACE }}/../ + cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../ + sed -i 's/^# %setup/%setup/' ../bforce.spec - name: Building buildtree run: | rpmdev-setuptree - mv ./bforce-${{ env.BFORCE_VER }}.tar.gz ./rpmbuild/SOURCES/ + mv ../bforce-${{ env.BFORCE_VER }}.tar.gz ./rpmbuild/SOURCES/ - name: Building binary and source RPM run: | - rpmbuild -bb ./bforce.spec --define "_topdir $( pwd )/rpmbuild" + rpmbuild -bb ../bforce.spec --define "_topdir $( pwd )/rpmbuild" - name: Constructing artifact name and version run: | echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV -- 2.47.2 From c91ca400378e5b40c07a6a45f783ec098a106023 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:26:53 +0300 Subject: [PATCH 07/21] alt-wf 6 --- .gitea/workflows/alt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 40af039..7137302 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -32,7 +32,7 @@ jobs: echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)" >> $GITHUB_ENV - name: Compressing source to tar.gz archive run: | - tar -cvzf ./bforce-${{ env.BFORCE_VER }}.tar.gz -c ${{ env.GITHUB_WORKSPACE }}/../ + tar -cvzf ../bforce-${{ env.BFORCE_VER }}.tar.gz -C ${{ env.GITHUB_WORKSPACE }}/.. bforce cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../ sed -i 's/^# %setup/%setup/' ../bforce.spec - name: Building buildtree -- 2.47.2 From d8d953b0b314e9886359f7d6233ad190579ac48d Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:49:15 +0300 Subject: [PATCH 08/21] alt-wf 7 --- .gitea/workflows/alt.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 7137302..256b6e2 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -33,7 +33,8 @@ jobs: - name: Compressing source to tar.gz archive run: | tar -cvzf ../bforce-${{ env.BFORCE_VER }}.tar.gz -C ${{ env.GITHUB_WORKSPACE }}/.. bforce - cp ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../ + cp -v ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../ + ls ../ sed -i 's/^# %setup/%setup/' ../bforce.spec - name: Building buildtree run: | -- 2.47.2 From 42246c136f9ffd599331e8c34896c00984c209ad Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 00:56:03 +0300 Subject: [PATCH 09/21] alt-wf 8 --- .gitea/workflows/alt.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 256b6e2..fbee7c7 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -39,10 +39,10 @@ jobs: - name: Building buildtree run: | rpmdev-setuptree - mv ../bforce-${{ env.BFORCE_VER }}.tar.gz ./rpmbuild/SOURCES/ + mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz ${{ env.GITHUB_WORKSPACE }}/rpmbuild/SOURCES/ - name: Building binary and source RPM run: | - rpmbuild -bb ../bforce.spec --define "_topdir $( pwd )/rpmbuild" + rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild" - name: Constructing artifact name and version run: | echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV -- 2.47.2 From 5a49ebdfe5dbd435ed3cd82d04b79d97a39e1269 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 01:01:35 +0300 Subject: [PATCH 10/21] alt-wf 9 --- .gitea/workflows/alt.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index fbee7c7..0b27896 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -34,6 +34,8 @@ jobs: run: | tar -cvzf ../bforce-${{ env.BFORCE_VER }}.tar.gz -C ${{ env.GITHUB_WORKSPACE }}/.. bforce cp -v ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../ + echo '-------------------------------------------------------' + pwd ls ../ sed -i 's/^# %setup/%setup/' ../bforce.spec - name: Building buildtree -- 2.47.2 From 1d696c0ba0f97cccf05da7a2ec5e12a2c7940f40 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 01:08:30 +0300 Subject: [PATCH 11/21] alt-wf 10 --- .gitea/workflows/alt.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 0b27896..54e6786 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -41,6 +41,8 @@ jobs: - name: Building buildtree run: | rpmdev-setuptree + ls . -l + mkdir -pv ./rpmbuild/SOURCES mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz ${{ env.GITHUB_WORKSPACE }}/rpmbuild/SOURCES/ - name: Building binary and source RPM run: | -- 2.47.2 From 330da471699f95e58ba0e43b8971772998515f0c Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 06:25:22 +0300 Subject: [PATCH 12/21] alt-wf 11 --- .gitea/workflows/alt.yaml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 54e6786..8f5d134 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -25,6 +25,8 @@ jobs: apt-get install -y gcc rpm-build rpmlint make python gear hasher patch rpmdevtools - name: Installing needed software run: apt-get install -y bison tcl + - name: Adding build user + run: useradd -d /builder -g users -m builder - name: Fetching sources uses: actions/checkout@v4 - name: Getting version info @@ -33,27 +35,31 @@ jobs: - name: Compressing source to tar.gz archive run: | tar -cvzf ../bforce-${{ env.BFORCE_VER }}.tar.gz -C ${{ env.GITHUB_WORKSPACE }}/.. bforce - cp -v ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec ../ + cp -v ${{ env.GITHUB_WORKSPACE }}/rpm/bforce.spec /builder/ + chown builder /builder/bforce.spec echo '-------------------------------------------------------' pwd - ls ../ - sed -i 's/^# %setup/%setup/' ../bforce.spec + ls /builder + sed -i 's/^# %setup/%setup/' /builder/bforce.spec - name: Building buildtree run: | - rpmdev-setuptree - ls . -l - mkdir -pv ./rpmbuild/SOURCES - mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz ${{ env.GITHUB_WORKSPACE }}/rpmbuild/SOURCES/ + su - builder -c "cd /builder && rpmdev-setuptree" + ls /builder -l + mkdir -pv /builder/rpmbuild/SOURCES + mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz /builder/rpmbuild/SOURCES/ + chown -r builder /builder/* - name: Building binary and source RPM run: | - rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild" + su - builder -c 'rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild"' - name: Constructing artifact name and version run: | echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV - name: Retrieving artifact files run: mkdir bforce && cp /builder/bforce-*.pkg.tar.zst bforce - - name: Try to upload artifacts + - name: Try to upload artifacts bin uses: actions/upload-artifact@v3 with: name: bforce-${{ env.BFORCE_VER }}-Arch - path: bforce + path: /builder/rpmbuild/RPMS + - name: Echo OK + run: echo "All OK" -- 2.47.2 From 2807cd61ff08f8d5a77a94df369bca6132ca4ba6 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 06:31:11 +0300 Subject: [PATCH 13/21] alt-wf 12 --- .gitea/workflows/alt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 8f5d134..cfa1fe4 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -18,7 +18,7 @@ jobs: - name: Installing prerequisites - update apt run: apt-get update - name: Installing prerequisites - install nodejs for actions & git - run: apt-get install -y git nodejs + run: apt-get install -y git nodejs su - name: Installing build environment continue-on-error: true run: | -- 2.47.2 From c665ce0aafccb370f4a42c2bf83874b9e9e66ea6 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 06:36:12 +0300 Subject: [PATCH 14/21] alt-wf 13 --- .gitea/workflows/alt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index cfa1fe4..7ca5f88 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -47,7 +47,7 @@ jobs: ls /builder -l mkdir -pv /builder/rpmbuild/SOURCES mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz /builder/rpmbuild/SOURCES/ - chown -r builder /builder/* + chown -R builder /builder/* - name: Building binary and source RPM run: | su - builder -c 'rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild"' -- 2.47.2 From b9e68f295e7f9430cb7e576eabd46c58c8d3d70d Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 06:45:35 +0300 Subject: [PATCH 15/21] alt-wf 14 --- .gitea/workflows/alt.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 7ca5f88..6082884 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -50,16 +50,16 @@ jobs: chown -R builder /builder/* - name: Building binary and source RPM run: | - su - builder -c 'rpmbuild -bb ${{ env.GITHUB_WORKSPACE }}/../bforce.spec --define "_topdir ${{ env.GITHUB_WORKSPACE }}/rpmbuild"' + su - builder -c 'rpmbuild -bb /builder/bforce.spec --define "_topdir /builder/rpmbuild"' - name: Constructing artifact name and version run: | - echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV + echo "BFORCE_VERLONG=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV - name: Retrieving artifact files - run: mkdir bforce && cp /builder/bforce-*.pkg.tar.zst bforce + run: mkdir bforce && cp /builder/rpmbuild/RPMS/bforce-*.rpm bforce - name: Try to upload artifacts bin uses: actions/upload-artifact@v3 with: - name: bforce-${{ env.BFORCE_VER }}-Arch + name: bforce-${{ env.BFORCE_VERLONG }}-Arch path: /builder/rpmbuild/RPMS - name: Echo OK run: echo "All OK" -- 2.47.2 From 4297b51dcabc254342562982cf82cf618e8542eb Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 09:14:40 +0300 Subject: [PATCH 16/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20rpm/bforce.spec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rpm/bforce.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/bforce.spec b/rpm/bforce.spec index 0f438da..ed0c384 100644 --- a/rpm/bforce.spec +++ b/rpm/bforce.spec @@ -6,6 +6,7 @@ Copyright: GPL Group: Fidonet/mailer Source0: bforce-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root +BuildArch: noarch %description BFORCE is a FTN mailer. Supports PSTN and binkp sessions. -- 2.47.2 From aae6656a4ab2b765ad71a9d71739eb465ca68283 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 09:37:44 +0300 Subject: [PATCH 17/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/alt.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/alt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 6082884..0f375b6 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -22,7 +22,7 @@ jobs: - name: Installing build environment continue-on-error: true run: | - apt-get install -y gcc rpm-build rpmlint make python gear hasher patch rpmdevtools + apt-get install -y gcc rpm-build rpmlint make python gear hasher fakeroot patch rpmdevtools - name: Installing needed software run: apt-get install -y bison tcl - name: Adding build user -- 2.47.2 From cf7208408c76cc4a5cd34a2fd5d4bb12bb39cf9e Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 09:46:14 +0300 Subject: [PATCH 18/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/alt.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/alt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 0f375b6..5c3f248 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -43,7 +43,7 @@ jobs: sed -i 's/^# %setup/%setup/' /builder/bforce.spec - name: Building buildtree run: | - su - builder -c "cd /builder && rpmdev-setuptree" + su - builder -c "cd /builder && mkdir -pv rpmbuild/{RPMS,SRPMS,SOURCES,BUILD,SPECS}" ls /builder -l mkdir -pv /builder/rpmbuild/SOURCES mv ${{ env.GITHUB_WORKSPACE }}/../bforce-${{ env.BFORCE_VER }}.tar.gz /builder/rpmbuild/SOURCES/ -- 2.47.2 From 6d042318d5910f5fd2376d94cf93fd01f0404ca3 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 09:52:26 +0300 Subject: [PATCH 19/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20rpm/bforce.spec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rpm/bforce.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rpm/bforce.spec b/rpm/bforce.spec index ed0c384..0f438da 100644 --- a/rpm/bforce.spec +++ b/rpm/bforce.spec @@ -6,7 +6,6 @@ Copyright: GPL Group: Fidonet/mailer Source0: bforce-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildArch: noarch %description BFORCE is a FTN mailer. Supports PSTN and binkp sessions. -- 2.47.2 From b95128f87af27162b915cbeb9cee7a87d9a06783 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 10:01:00 +0300 Subject: [PATCH 20/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/alt.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/alt.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/alt.yaml b/.gitea/workflows/alt.yaml index 5c3f248..dcbe279 100644 --- a/.gitea/workflows/alt.yaml +++ b/.gitea/workflows/alt.yaml @@ -55,11 +55,11 @@ jobs: run: | echo "BFORCE_VERLONG=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV - name: Retrieving artifact files - run: mkdir bforce && cp /builder/rpmbuild/RPMS/bforce-*.rpm bforce + run: mkdir bforce && cp /builder/rpmbuild/RPMS/x86_64/bforce-*.rpm bforce - name: Try to upload artifacts bin uses: actions/upload-artifact@v3 with: - name: bforce-${{ env.BFORCE_VERLONG }}-Arch - path: /builder/rpmbuild/RPMS + name: bforce-${{ env.BFORCE_VERLONG }}-Alt + path: /builder/rpmbuild/RPMS/x86_64 - name: Echo OK run: echo "All OK" -- 2.47.2 From df5a91528749435e6bab88e83b7f3679d8447461 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Wed, 16 Apr 2025 10:18:21 +0300 Subject: [PATCH 21/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 38ef0b3..d2296bd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![master branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/debpkg.yaml/badge.svg?branch=master) ![master branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=master) +![master branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/alt.yaml/badge.svg?branch=master) BinkleyForce FTN mailer ----------------------- -- 2.47.2