Merge pull request #10 from STNS/support-arm

Support arm

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+---
+name: test
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    env:
+      GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: dump keys
+      run: |
+        mkdir -p keys
+        echo -n '${{ secrets.GPG_PUBLIC_KEY }}' > keys/pub.key
+        echo -n '${{ secrets.GPG_SECRET_KEY }}' > keys/sec.key
+    - name: pkg
+      run: make pkg
+    - name: yum
+      run: make yumrepo
+    - name: deb
+      run: make debrepo

assets/conf/distributions

@@ -1,7 +1,7 @@
 Origin: stns
 Label: stns
 Codename: stns
-Architectures: amd64
+Architectures: amd64 arm64
 Components: main
 Description: Apt repository for project stns
 SignWith: ED9008B740C6735CB3EF098C37DE344F75E258B6

dockerfiles/Dockerfile.debrepo

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 RUN apt-get -qqy update && \
     apt-get install -yq reprepro curl gnupg2
 
@@ -9,8 +9,8 @@ COPY . /opt/pkg
 WORKDIR /opt/pkg
 RUN rm -rf releases && mkdir releases
 RUN mkdir -p releases/$DIST
-RUN if [ "$DIST" = "debian" ];then cp -pr builds/stns-v2*64*jammy*.deb releases/$DIST;else cp -pr builds/stns-v2*64*$DIST*.deb releases/$DIST;fi && \
-if [ "$DIST" = "debian" ];then cp -pr builds/cache-stnsd*64*jammy*.deb releases/$DIST;else cp -pr builds/cache-stnsd*64*$DIST*.deb releases/$DIST;fi && \
+RUN cp -pr builds/stns-v2*64*.deb releases/$DIST && \
+    cp -pr builds/cache-stnsd*64*.deb releases/$DIST && \
 if [ "$DIST" = "debian" ];then cp -pr builds/libnss*64*jammy*.deb releases/$DIST;else cp -pr builds/libnss*64*$DIST*.deb releases/$DIST;fi
 
 RUN mkdir -p /root/.gnupg && echo 'digest-algo sha256' >> /root/.gnupg/gpg.conf

dockerfiles/Dockerfile.yumrepo

@@ -5,16 +5,23 @@ WORKDIR /opt/pkg
 RUN rm -rf releases && mkdir releases
 RUN mkdir -p releases/centos/x86_64/{7,2}
 RUN mkdir -p releases/almalinux/x86_64/9
+RUN mkdir -p releases/centos/aarch64/{7,2}
+RUN mkdir -p releases/almalinux/aarch64/9
 
 RUN echo '%_signature gpg' >> ~/.rpmmacros && \
 echo '%_gpg_name stns-server' >> ~/.rpmmacros && \
 echo '%_gpg_digest_algo sha256' >> ~/.rpmmacros &&\
 echo '%_gpg_hash_algo 8' >> ~/.rpmmacros
 
-RUN cp -pr builds/*64*.rpm releases/centos/x86_64/
-RUN cp -pr builds/*64*.el9.rpm releases/almalinux/x86_64/9/
-RUN cp -pr builds/*64*.el7.rpm releases/centos/x86_64/7/
-RUN cp -pr builds/*64*.el7.rpm releases/centos/x86_64/2/
+RUN cp -pr builds/*{amd64,x86_64}*.rpm releases/centos/x86_64/
+RUN cp -pr builds/*{amd64,x86_64}*.rpm releases/almalinux/x86_64/9/
+RUN cp -pr builds/*{amd64,x86_64}*.rpm releases/centos/x86_64/7/
+RUN cp -pr builds/*{amd64,x86_64}*.rpm releases/centos/x86_64/2/
+
+RUN cp -pr builds/*{arm64,aarch64}*.rpm releases/centos/aarch64/
+RUN cp -pr builds/*{arm64,aarch64}*.rpm releases/almalinux/aarch64/9/
+RUN cp -pr builds/*{arm64,aarch64}*.rpm releases/centos/aarch64/7/
+RUN cp -pr builds/*{arm64,aarch64}*.rpm releases/centos/aarch64/2/
 
 ENV GPG_PASSWORD dummy
 CMD bin/import_gpgkey &>/dev/null && \
@@ -26,4 +33,12 @@ createrepo --checksum sha256 releases/centos/x86_64/ && \
 createrepo --checksum sha256 releases/almalinux/x86_64/9 && \
 createrepo --checksum sha256 releases/centos/x86_64/7 && \
 createrepo --checksum sha256 releases/centos/x86_64/2 && \
+rpm --addsign releases/centos/aarch64/*.rpm && \
+rpm --addsign releases/almalinux/aarch64/9/*.rpm && \
+rpm --addsign releases/centos/aarch64/7/*.rpm && \
+rpm --addsign releases/centos/aarch64/2/*.rpm && \
+createrepo --checksum sha256 releases/centos/aarch64/ && \
+createrepo --checksum sha256 releases/almalinux/aarch64/9 && \
+createrepo --checksum sha256 releases/centos/aarch64/7 && \
+createrepo --checksum sha256 releases/centos/aarch64/2 && \
 cp -r releases/* repo/