From 4f60c312823f3f7ba514cd034245d472c0e78951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 26 Oct 2022 11:58:37 +0200 Subject: [PATCH] ci: use cleanup instead of always step in post steps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simply appropriate. https://www.jenkins.io/doc/book/pipeline/syntax/#post Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.linux | 2 +- ci/Jenkinsfile.linux-cpp | 2 +- ci/Jenkinsfile.macos | 2 +- ci/Jenkinsfile.macos-cpp.todo | 2 +- ci/Jenkinsfile.uitests | 2 +- ci/Jenkinsfile.windows | 2 +- ci/Jenkinsfile.windows-cpp.todo | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index ed585dc2b6..23681c99e4 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -96,6 +96,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs() } + cleanup { cleanWs() } } } diff --git a/ci/Jenkinsfile.linux-cpp b/ci/Jenkinsfile.linux-cpp index 89929652dc..52a3231a84 100644 --- a/ci/Jenkinsfile.linux-cpp +++ b/ci/Jenkinsfile.linux-cpp @@ -85,6 +85,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs() } + cleanup { cleanWs() } } } diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index 4fcf987db9..6d5bd8fb31 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -108,6 +108,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs() } + cleanup { cleanWs() } } } diff --git a/ci/Jenkinsfile.macos-cpp.todo b/ci/Jenkinsfile.macos-cpp.todo index d75d2d4589..34b606f71b 100644 --- a/ci/Jenkinsfile.macos-cpp.todo +++ b/ci/Jenkinsfile.macos-cpp.todo @@ -77,6 +77,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs() } + cleanup { cleanWs() } } } diff --git a/ci/Jenkinsfile.uitests b/ci/Jenkinsfile.uitests index 1e17f4d70c..0b1d321651 100644 --- a/ci/Jenkinsfile.uitests +++ b/ci/Jenkinsfile.uitests @@ -144,6 +144,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs() } + cleanup { cleanWs() } } } diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index 184212e0ce..e785146197 100644 --- a/ci/Jenkinsfile.windows +++ b/ci/Jenkinsfile.windows @@ -99,6 +99,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs(disableDeferredWipeout: true) } + cleanup { cleanWs(disableDeferredWipeout: true) } } } diff --git a/ci/Jenkinsfile.windows-cpp.todo b/ci/Jenkinsfile.windows-cpp.todo index b7797f6974..55f409b33c 100644 --- a/ci/Jenkinsfile.windows-cpp.todo +++ b/ci/Jenkinsfile.windows-cpp.todo @@ -78,6 +78,6 @@ pipeline { post { success { script { github.notifyPR(true) } } failure { script { github.notifyPR(false) } } - always { cleanWs() } + cleanup { cleanWs() } } }