diff --git a/Jenkinsfile b/Jenkinsfile index 4738e9c..066d645 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,14 +11,6 @@ pipeline { branch 'main' } steps { - // dir ('build-dir') { - // checkout poll: false, scm: scmGit([ - // branches: [[name: 'main']], - // userRemoteConfigs: [[credentialsId: 'gitea-jenkins-user-token', url: 'https://gitea.fahrecker.com/andreas-personal/AndysAdguardHomeBlocklist.git']] - // ]) - // sh 'git checkout main' - // sh 'pwd' - // } sh 'git checkout main' } } @@ -28,10 +20,7 @@ pipeline { branch 'main' } steps { - // dir ('build-dir') { - sh 'pwd' - sh 'npm clean-install' - // } + sh 'npm clean-install' } } stage('Compile Adblock List') { @@ -40,14 +29,12 @@ pipeline { branch 'main' } steps { - // dir ('build-dir') { - sh ''' - mkdir -p out - npm run compile:test - git add out/andysadguardhomeblocklist.txt - git commit -m "Update Compiled Adblock List" - ''' - // } + sh 'mkdir -p out' + sh 'rm out/andysadguardhomeblocklist.txt' + sh ''' + git add out/andysadguardhomeblocklist.txt + git commit -m "Update Compiled Adblock List" + ''' } } stage('git push') { @@ -56,16 +43,14 @@ pipeline { branch 'main' } steps { - // dir ('build-dir') { - withCredentials([ - gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token') - ]) { - sh ''' - git pull origin main - git push - ''' - } - // } + withCredentials([ + gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token') + ]) { + sh ''' + git pull origin main + git push + ''' + } } } }