1414 UPSTREAM_GH : https://api.github.com/repos/flatwhatson/emacs
1515
1616jobs :
17- image :
17+ check :
1818 runs-on : ubuntu-latest
1919 env :
2020 OLD_COMMIT_N : ${{ github.event.inputs.old_commit_n }}
@@ -24,45 +24,41 @@ jobs:
2424 run : |
2525 # Check if a new release is needed
2626 if ["$OLD_COMMIT_N" == "$NEW_COMMIT_N" ]; then exit 1; else exit 0; fi
27- - uses : actions/checkout@v2
28- - name : Set up Docker Buildx
29- id : buildx
30- uses : docker/setup-buildx-action@master
31- - name : Login to GitHub Container Registry
32- uses : docker/login-action@v1
33- with :
34- username : ${{ secrets.DOCKERHUB_USERNAME }}
35- password : ${{ secrets.DOCKERHUB_TOKEN }}
27+ - name : Set env var
28+ id : var
29+ run : |
30+ VER=$(curl -s https://raw.githubusercontent.com/flatwhatson/emacs/pgtk-nativecomp/configure.ac | grep AC_INIT | sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')
31+ VER+="."
32+ VER+="$NEW_COMMIT_N"
33+ export VER="${VER}"
34+ echo "::set-output name=ver::${VER}"
35+ outputs :
36+ ver : ${{ steps.var.outputs.ver }}
3637
3738 artifact :
3839 runs-on : ubuntu-latest
39- needs : [image]
40+ needs : check
4041 container :
4142 image : mpsq/emacs-builder:latest
4243 env :
4344 OLD_COMMIT_N : ${{ github.event.inputs.old_commit_n }}
4445 NEW_COMMIT_N : ${{ github.event.inputs.new_commit_n }}
46+ PKG_VERSION : ${{ needs.check.outputs.ver }}
4547 steps :
4648 - name : Prepare artifacts
4749 run : |
48- ./pull.bash
49-
50- # Get/set version number
51- version=$(grep AC_INIT configure.ac | sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')
52- version+="."
53- version+="$NEW_COMMIT_N"
54- echo "pkg_version=$version" >> $GITHUB_ENV
50+ cd /home/pcr
5551
52+ # Create artifacts
53+ ./pull.bash
5654 makepkg
5755
5856 # Unpack artifacts
5957 mkdir out
6058 tar xf emacs-1-1-x86_64.pkg.tar.zst -C out
6159 rm emacs-1-1-x86_64.pkg.tar.zst
6260 rm out/.BUILDINFO out/.MTREE out/.PKGINFO
63- tar czf "$version".tar.gz -C out .
64- sum=$(sha512sum "$version".tar.gz | sed -r 's/(.*)\s\s.*/\1/')
65- echo "pkg_sum=$sum" >> $GITHUB_ENV
61+ tar czf "$PKG_VERSION".tar.gz -C out .
6662
6763 # Get release body
6864 delta=$(echo "$NEW_COMMIT_N - $OLD_COMMIT_N" | bc)
8581 env :
8682 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
8783 with :
88- tag_name : ${{ env.pkg_version }}
89- release_name : Release ${{ env.pkg_version }}
84+ tag_name : ${{ needs.check.outputs.ver }}
85+ release_name : Release ${{ needs.check.outputs.ver }}
9086 body_path : /home/pcr/body.md
9187 draft : false
9288 prerelease : false
@@ -97,19 +93,21 @@ jobs:
9793 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
9894 with :
9995 upload_url : ${{ steps.create_release.outputs.upload_url }}
100- asset_path : /home/pcr/${{ env.pkg_version }}.tar.gz
101- asset_name : ${{ env.pkg_version }}.tar.gz
96+ asset_path : /home/pcr/${{ needs.check.outputs.ver }}.tar.gz
97+ asset_name : ${{ needs.check.outputs.ver }}.tar.gz
10298 asset_content_type : application/gzip
10399 - name : Prepare and push new version to AUR
104100 env :
105- PKG_SUM : ${{ env.pkg_sum }}
106- PKG_VERSION : ${{ env.pkg_version }}
107101 PRIV_KEY : ${{ secrets.PRIV_KEY }}
108102 PUB_KEY : ${{ secrets.PUB_KEY }}
109103 run : |
110- mkdir .ssh
104+ cd /home/pcr
105+
106+ # Checksum artifacts
107+ sum=$(sha512sum "$PKG_VERSION".tar.gz | sed -r 's/(.*)\s\s.*/\1/')
111108
112109 # Setup SSH
110+ mkdir .ssh
113111 echo "$PUB_KEY" | tr -d '\r' > .ssh/id_aur.pub
114112 echo "$PRIV_KEY" | base64 --decode > .ssh/id_aur
115113 chmod 600 .ssh/id_aur
@@ -118,19 +116,18 @@ jobs:
118116 ssh-keyscan 95.216.144.15 >> .ssh/known_hosts
119117
120118 # Setup git
121- git config --global user.name "Méril Pilon"
122- git config --global user.email "[email protected] " 123- git clone ssh://aur.archlinux.org/emacs-gcc-wayland-devel-bin.git
119+ alias mygit="git -c user.name=Méril\ Pilon -c [email protected] " 120+ mygit clone ssh://aur.archlinux.org/emacs-gcc-wayland-devel-bin.git
124121 cd emacs-gcc-wayland-devel-bin
125122
126123 # Amend package, set pkgver, sha512 sum and pkgrel + fix permissions
127124 sed -i -r -e 's~pkgver=.*~pkgver='$PKG_VERSION'~' PKGBUILD
128- sed -i -r -e 's~sha512sums=.*~sha512sums=\("'"$PKG_SUM "'"\)~' PKGBUILD
125+ sed -i -r -e 's~sha512sums=.*~sha512sums=\("'"$sum "'"\)~' PKGBUILD
129126 sed -i -r -e 's/pkgrel=.*/pkgrel=1/' PKGBUILD
130127 rm .SRCINFO
131128 makepkg --printsrcinfo > .SRCINFO
132129
133130 # Push changes
134- git add .SRCINFO PKGBUILD
135- git commit -m "Bump to $PKG_VERSION"
136- git push origin master
131+ mygit add .SRCINFO PKGBUILD
132+ mygit commit -m "Bump to $PKG_VERSION"
133+ mygit push origin master
0 commit comments