Skip to content

Commit ac35fce

Browse files
dwightguthehildenb
authored andcommitted
Fix arch (#422)
* Revert "fix multiline" This reverts commit a47e4b2. * Revert "Jenkinsfile: comment out arch for now (#421)" This reverts commit a067e60. * deps/k: update submodule * Jenkinsfile: remove -B from make build * deps/k: update submodule * deps/k: update submodule
1 parent bb75ac3 commit ac35fce

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Jenkinsfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pipeline {
3838
stage('Build') {
3939
steps {
4040
sh '''
41-
make build build-llvm build-haskell build-node -j4 -B
41+
make build build-llvm build-haskell build-node -j4
4242
'''
4343
}
4444
}
@@ -169,10 +169,10 @@ pipeline {
169169
commit_short=$(cd deps/k && git rev-parse --short HEAD)
170170
K_RELEASE="https://github.com/kframework/k/releases/download/nightly-$commit_short"
171171
curl --fail --location "${K_RELEASE}/kframework_5.0.0_amd64_bionic.deb" --output kframework.deb
172-
# curl --fail --location "${K_RELEASE}/kframework-5.0.0-1-x86_64.pkg.tar.xz" --output kframework-git.pkg.tar.xz
172+
curl --fail --location "${K_RELEASE}/kframework-5.0.0-1-x86_64.pkg.tar.xz" --output kframework-git.pkg.tar.xz
173173
'''
174174
stash name: 'bionic-kframework', includes: 'kframework.deb'
175-
//stash name: 'arch-kframework', includes: 'kframework-git.pkg.tar.xz'
175+
stash name: 'arch-kframework', includes: 'kframework-git.pkg.tar.xz'
176176
}
177177
}
178178
}
@@ -239,7 +239,7 @@ pipeline {
239239
'''
240240
}
241241
}
242-
}/*
242+
}
243243
stage('Build Arch Package') {
244244
agent {
245245
dockerfile {
@@ -281,7 +281,7 @@ pipeline {
281281
'''
282282
}
283283
}
284-
}*/
284+
}
285285
stage('Upload Release') {
286286
agent {
287287
dockerfile {
@@ -295,13 +295,14 @@ pipeline {
295295
dir("kevm-${env.KEVM_RELEASE_ID}") {
296296
unstash 'src-kevm'
297297
unstash 'bionic-kevm'
298-
// unstash 'arch-kevm'
298+
unstash 'arch-kevm'
299299
sh '''
300300
release_tag="v${KEVM_RELEASE_ID}-$(git rev-parse --short HEAD)"
301301
make release.md KEVM_RELEASE_TAG=${release_tag}
302302
hub release create \
303303
--attach "kevm-${KEVM_RELEASE_ID}-src.tar.gz#Source tar.gz" \
304304
--attach "kevm_${KEVM_RELEASE_ID}_amd64.deb#Ubuntu Bionic (18.04) Package" \
305+
--attach "kevm-${KEVM_RELEASE_ID}/package/kevm-git-${KEVM_RELEASE_ID}-1-x86_64.pkg.tar.xz#Arch Package" \
305306
--file "release.md" "${release_tag}"
306307
'''
307308
}

deps/k

Submodule k updated from 1af4b5c to ab08f9a

0 commit comments

Comments
 (0)