Skip to content

Commit

Permalink
Disable arch packaging (#515)
Browse files Browse the repository at this point in the history 
* Jenkinsfile: disable arch release

* INSTALL: update release file text
  • Loading branch information
@ehildenb
ehildenb authored and dwightguth committed Oct 3, 2019
1 parent bd41346 commit c5505ad
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 60 deletions.
10 changes: 1 addition & 9 deletions INSTALL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Installing Release Builds
These instructions explain how to download, install, and build the KEVM packages.
Current supported systems are:

- Arch Linux
- Ubuntu Bionic (18.04)
- Debian Buster

Downloading Packages
--------------------
Expand All @@ -24,14 +24,6 @@ Install the package with (`X.Y.Z` is version number, `ID` is platform identifier
sudo apt install ./kevm_X.Y.Z_amd64_ID.deb
```

### Arch

Install the package with (`X.Y.Z-V` is version number):

```sh
sudo pacman -U ./kevm-git-X.Y.Z-V-x86_64.pkg.tar.xz
```

Building Packages
-----------------

Expand Down
102 changes: 51 additions & 51 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,51 +308,51 @@ pipeline {
}
}
}
stage('Build Arch Package') {
agent {
dockerfile {
dir "kevm-${env.KEVM_RELEASE_ID}/package"
filename 'Dockerfile.arch'
additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g)'
reuseNode true
}
}
steps {
dir("kevm-${env.KEVM_RELEASE_ID}") {
checkout scm
unstash 'arch-kframework'
sh '''
sudo pacman -Syu --noconfirm
sudo pacman --noconfirm -U kframework-git.pkg.tar.xz
cd package
makepkg --noconfirm --syncdeps
'''
}
stash name: 'arch-kevm', includes: "kevm-${env.KEVM_RELEASE_ID}/package/kevm-git-${env.KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz"
}
}
stage('Test Arch Package') {
options { timeout(time: 15, unit: 'MINUTES') }
agent {
dockerfile {
dir "kevm-${env.KEVM_RELEASE_ID}/package"
filename 'Dockerfile.arch'
additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g)'
reuseNode true
}
}
steps {
dir("kevm-${env.KEVM_RELEASE_ID}") {
unstash 'arch-kevm'
sh '''
sudo pacman -Syu --noconfirm
sudo pacman --noconfirm -U package/kevm-git-${KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz
export PATH=$PATH:$(pwd)/.build/defn/vm
make test-interactive-firefly
'''
}
}
}
// stage('Build Arch Package') {
// agent {
// dockerfile {
// dir "kevm-${env.KEVM_RELEASE_ID}/package"
// filename 'Dockerfile.arch'
// additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g)'
// reuseNode true
// }
// }
// steps {
// dir("kevm-${env.KEVM_RELEASE_ID}") {
// checkout scm
// unstash 'arch-kframework'
// sh '''
// sudo pacman -Syu --noconfirm
// sudo pacman --noconfirm -U kframework-git.pkg.tar.xz
// cd package
// makepkg --noconfirm --syncdeps
// '''
// }
// stash name: 'arch-kevm', includes: "kevm-${env.KEVM_RELEASE_ID}/package/kevm-git-${env.KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz"
// }
// }
// stage('Test Arch Package') {
// options { timeout(time: 15, unit: 'MINUTES') }
// agent {
// dockerfile {
// dir "kevm-${env.KEVM_RELEASE_ID}/package"
// filename 'Dockerfile.arch'
// additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g)'
// reuseNode true
// }
// }
// steps {
// dir("kevm-${env.KEVM_RELEASE_ID}") {
// unstash 'arch-kevm'
// sh '''
// sudo pacman -Syu --noconfirm
// sudo pacman --noconfirm -U package/kevm-git-${KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz
// export PATH=$PATH:$(pwd)/.build/defn/vm
// make test-interactive-firefly
// '''
// }
// }
// }
stage('Upload Release') {
agent {
dockerfile {
Expand All @@ -371,20 +371,20 @@ pipeline {
dir("buster") {
unstash 'buster-kevm'
}
dir("arch") {
unstash 'arch-kevm'
}
// dir("arch") {
// unstash 'arch-kevm'
// }
sh '''
release_tag="v${KEVM_RELEASE_ID}-$(git rev-parse --short HEAD)"
make release.md KEVM_RELEASE_TAG=${release_tag}
mv bionic/kevm_${KEVM_RELEASE_ID}_amd64.deb bionic/kevm_${KEVM_RELEASE_ID}_amd64_bionic.deb
mv buster/kevm_${KEVM_RELEASE_ID}_amd64.deb buster/kevm_${KEVM_RELEASE_ID}_amd64_buster.deb
hub release create \
--attach "kevm-${KEVM_RELEASE_ID}-src.tar.gz#Source tar.gz" \
--attach "bionic/kevm_${KEVM_RELEASE_ID}_amd64_bionic.deb#Ubuntu Bionic (18.04) Package" \
--attach "buster/kevm_${KEVM_RELEASE_ID}_amd64_buster.deb#Debian Buster (10) Package" \
--attach "arch/kevm-${KEVM_RELEASE_ID}/package/kevm-git-${KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz#Arch Package" \
--attach "bionic/kevm_${KEVM_RELEASE_ID}_amd64_bionic.deb#Ubuntu Bionic (18.04) Package" \
--attach "buster/kevm_${KEVM_RELEASE_ID}_amd64_buster.deb#Debian Buster (10) Package" \
--file "release.md" "${release_tag}"
// --attach "arch/kevm-${KEVM_RELEASE_ID}/package/kevm-git-${KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz#Arch Package" \
'''
}
}
Expand Down

0 comments on commit c5505ad

Please sign in to comment.