Skip to content

Commit

Permalink
Backport wsl 3.2.4 fixes to Dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/pkgdeploy.yaml
#	VERSION
#	src/wslsys.sh
#	src/wslu-header
#	src/wslview.sh
  • Loading branch information
patrick330602 committed Mar 21, 2022
2 parents 2e79cbf + 3579f75 commit be13c47
Show file tree
Hide file tree
Showing 22 changed files with 256 additions and 800 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@

github: patrick330602
open_collective: wslu
custom: ['https://www.paypal.me/callmepk/']
2 changes: 1 addition & 1 deletion .github/actions/rpmbuild/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# A copy of robertdebock/github-action-rpmbuild because that one don't work
FROM centos:8
FROM rockylinux/rockylinux:8

WORKDIR /github/workspace

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/manpage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ jobs:
git config --global user.email "me@patrickwu.space"
git config --global user.name "Jinming Wu, Patrick"
git clone --depth 1 https://patrick330602:$GH_TOKEN@github.com/wslutilities/wslutilities.github.io.git website
mkdir -p ./website/wslu/man
cp docs/*.html ./website/wslu/man
bash -x extras/scripts/manpage_deploy.bash
git --git-dir=./website/.git --work-tree=./website add -A
git --git-dir=./website/.git --work-tree=./website commit -m "Manpage update"
git --git-dir=./website/.git --work-tree=./website push
Expand Down
29 changes: 24 additions & 5 deletions .github/workflows/pkgbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
- dev/**
- lts/**
jobs:
debbuild:
name: Debian
deb10build:
name: Debian 10
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
Expand All @@ -23,7 +23,26 @@ jobs:
mv ../wsl*.* ./pkgs
- uses: actions/upload-artifact@v1
with:
name: DebianDEBs
name: Debian10DEBs
path: pkgs
deb11build:
name: Debian 11
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install Pre-requisites
run: |
sudo apt-get update -qq
sudo apt-get install -qq apt-utils build-essential gzip devscripts debhelper
- name: Build Debian Package
run: |
bash ./configure.sh --deb bullseye
debuild -i -us -uc -b
mkdir -p ./pkgs
mv ../wsl*.* ./pkgs
- uses: actions/upload-artifact@v1
with:
name: Debian1DEBs
path: pkgs
pgwbuild:
name: Pengwin
Expand Down Expand Up @@ -68,7 +87,7 @@ jobs:
run: |
sudo apt-get update -qq
sudo apt-get install -qq build-essential tar
- name:
- name: configure
run: |
bash ./configure.sh --rpm
cp extras/build/rpm/wslu.spec ../wslu.spec
Expand Down Expand Up @@ -98,4 +117,4 @@ jobs:
# git clone --depth 1 https://patrick330602:$GH_TOKEN@github.com/wslutilities/rpm-wslu.git rpm-repo
# git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo add -A
# git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo commit -m "RPM Packaging file update: $(date)"
# git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo push
# git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo push
44 changes: 37 additions & 7 deletions .github/workflows/pkgdeploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
mv ../wsl*.* ./pkgs
- uses: actions/upload-artifact@v1
with:
name: DebianDEBs
name: Debian10DEBs
path: pkgs
pgwbuild:
name: Pengwin
Expand Down Expand Up @@ -57,19 +57,19 @@ jobs:
env:
PACKAGECLOUD_TOKEN: ${{ secrets.PGW_DEV_DEPLOY_KEY }}
run: package_cloud push whitewaterfoundry/wslu/debian/bullseye ./PengwinDEBs/*.deb --skip-errors
rpmbuild:
name: RPM
rpmobsbuild:
name: RPM - OpenSUSE Build Service
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install Pre-requisites
run: |
sudo apt-get update -qq
sudo apt-get install -qq build-essential tar
- name:
- name: configure
run: |
bash ./configure.sh --rpm
cp extras/build/rpm/wslu.spec ../wslu.spec
cp extras/build/rpm/obs/wslu.spec ../wslu.spec
rm -rf *
mkdir -p SOURCES
mkdir -p SPECS
Expand All @@ -85,7 +85,36 @@ jobs:
#uses: robertdebock/rpmbuild-action@1.1.1
- uses: actions/upload-artifact@v1
with:
name: RPMs
name: OBSRPMs
path: compiled_rpms
name: RPM - COPR
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install Pre-requisites
run: |
sudo apt-get update -qq
sudo apt-get install -qq build-essential tar
- name: configure
run: |
bash ./configure.sh --rpm
cp extras/build/rpm/copr/wslu.spec ../wslu.spec
rm -rf *
mkdir -p SOURCES
mkdir -p SPECS
cp ../wslu-*.tar.gz SOURCES
cp ../wslu.spec SPECS
- name: rpmbuild
uses: ./.github/actions/rpmbuild/
- name: moving files
run: |
mkdir compiled_rpms
cp SRPMS/* compiled_rpms
cp RPMS/noarch/* compiled_rpms
#uses: robertdebock/rpmbuild-action@1.1.1
- uses: actions/upload-artifact@v1
with:
name: COPRRPMs
path: compiled_rpms
coprdeploy:
name: COPR Deploying
Expand All @@ -108,4 +137,5 @@ jobs:
dnf -y install @development-tools @rpm-development-tools
dnf -y install copr-cli make
- name: Submit the build by uploading the source RPM
run: copr build praiskup/argparse-manpage-ci RPMs/*.src.rpm
run: copr build praiskup/argparse-manpage-ci RPMs/*.src.rpm
run: copr build praiskup/argparse-manpage-ci RPMs/*.src.rpm
188 changes: 0 additions & 188 deletions README.eo.md

This file was deleted.

Loading

0 comments on commit be13c47

Please sign in to comment.