diff --git a/.gitignore b/.gitignore index f97fbae..8f63462 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,5 @@ +*.swp .direnv -<<<<<<< HEAD -<<<<<<< HEAD -||||||| parent of 2ccfcd1 (fixup flake) -testgit -*.swp -======= -testgit -*.swp +pad-archiver result ->>>>>>> 2ccfcd1 (fixup flake) -||||||| parent of 056d53e (port to go) -======= testgit -*.swp ->>>>>>> 056d53e (port to go) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90d250c..02b0d52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,6 @@ build_image: rules: - if: '$CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH' script: + - go build - docker build -t $IMAGE_NAME:$CI_COMMIT_BRANCH . - docker push $IMAGE_NAME:$CI_COMMIT_BRANCH diff --git a/Dockerfile b/Dockerfile index c6ee901..a4ddc38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine/git RUN apk add --no-cache curl -ADD ./update /usr/bin/update +ADD ./pad-archiver /usr/bin/pad-archiver # Override ENTRYPOINT of alpine/git ENTRYPOINT /bin/sh diff --git a/lib/gitlab-ci.yml b/lib/gitlab-ci.yml index 81bab01..67f1692 100644 --- a/lib/gitlab-ci.yml +++ b/lib/gitlab-ci.yml @@ -12,5 +12,5 @@ update: - git config --global user.email "git@git.fginfo.tu-bs.de" - git config --global user.name "Gitlab CI" script: - - update < pads.txt + - pad-archiver < pads.txt - git push "https://gitlab-ci-token:${CI_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_REF_NAME}" -o skip-ci diff --git a/pad-archiver b/pad-archiver deleted file mode 100755 index d742661..0000000 Binary files a/pad-archiver and /dev/null differ