From a31b52188706ea71f104fb89dc9c08a1dbd091bf Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Fri, 14 Jun 2019 17:19:09 +0000
Subject: [PATCH 1/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6bdbef..c1fbaf8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
- build_package
- install_package
- check_package
+ - deploy_package
check_pkgbuild:
image: ${CI_REGISTRY}/personal/homelab/docker/arch-pkg-build:latest
@@ -30,4 +31,15 @@ check_package:
- namcap *.pkg.tar.xz > PKG.namcap.out
artifacts:
paths:
- - PKG.namcap.out
\ No newline at end of file
+ - PKG.namcap.out
+
+deploy_package:
+ stage: deploy_package
+ tags:
+ - python
+ script:
+ - mkdir ~/.aws/
+ - touch ~/.aws/credentials
+ - pip install awscli
+ - printf "[eb-cli]\naws_access_key_id = %s\naws_secret_access_key = %s\n" "$AWS_ACCESS_KEY_ID" "$AWS_SECRET_ACCESS_KEY" >> ~/.aws/credentials
+ - aws s3 sync *.pkg.tar.xz s3://s3.eu-central-1.wasabisys.com/my-arch-repo/ --acl public-read
\ No newline at end of file
From c045b842f18215ffe951b11c29a598976c7460a3 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Fri, 14 Jun 2019 17:20:55 +0000
Subject: [PATCH 2/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1fbaf8..183dd8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,9 +34,8 @@ check_package:
- PKG.namcap.out
deploy_package:
+ image: python
stage: deploy_package
- tags:
- - python
script:
- mkdir ~/.aws/
- touch ~/.aws/credentials
From 09a3f171c502052a2f10999f905a4da3b09256f4 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Fri, 14 Jun 2019 17:23:55 +0000
Subject: [PATCH 3/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 183dd8a..12b43ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ check_package:
- PKG.namcap.out
deploy_package:
- image: python
+ image: python:alpine
stage: deploy_package
script:
- mkdir ~/.aws/
From e4451ef414450f96ae8e135b695eb7d126dcd044 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Fri, 14 Jun 2019 17:29:00 +0000
Subject: [PATCH 4/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12b43ef..1b5da4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,8 +37,5 @@ deploy_package:
image: python:alpine
stage: deploy_package
script:
- - mkdir ~/.aws/
- - touch ~/.aws/credentials
- pip install awscli
- - printf "[eb-cli]\naws_access_key_id = %s\naws_secret_access_key = %s\n" "$AWS_ACCESS_KEY_ID" "$AWS_SECRET_ACCESS_KEY" >> ~/.aws/credentials
- aws s3 sync *.pkg.tar.xz s3://s3.eu-central-1.wasabisys.com/my-arch-repo/ --acl public-read
\ No newline at end of file
From 2954c1127e3b0eec616a8c7f4ab400fb985c17ef Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Fri, 14 Jun 2019 17:45:27 +0000
Subject: [PATCH 5/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b5da4a..7b4f693 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,7 @@ check_package:
- PKG.namcap.out
deploy_package:
- image: python:alpine
+ image: andthensome/awscli
stage: deploy_package
script:
- - pip install awscli
- aws s3 sync *.pkg.tar.xz s3://s3.eu-central-1.wasabisys.com/my-arch-repo/ --acl public-read
\ No newline at end of file
From 89779aba216e549b8211dea4e0660f7af4d2b52c Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Mon, 17 Jun 2019 14:49:27 +0000
Subject: [PATCH 6/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b4f693..a22483e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,4 +37,4 @@ deploy_package:
image: andthensome/awscli
stage: deploy_package
script:
- - aws s3 sync *.pkg.tar.xz s3://s3.eu-central-1.wasabisys.com/my-arch-repo/ --acl public-read
\ No newline at end of file
+ - aws s3 sync . --endpoint-url=https://s3.eu-central-1.wasabisys.com s3://my-arch-repo/ --acl public-read --exclude "*" --include "*.pkg.tar.xz"
\ No newline at end of file
From 052af870cb6d2847b67a550e64fe6e305643b330 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Mon, 17 Jun 2019 16:04:13 +0000
Subject: [PATCH 7/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a22483e..3e10104 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
- build_package
- install_package
- check_package
+ - build_repo
- deploy_package
check_pkgbuild:
@@ -24,6 +25,15 @@ build_package:
- "*.log"
- "*.pkg.tar.xz"
+build_repo:
+ state: build_repo
+ script:
+ - mkdir -p local-repo
+ - repo-add local-repo/higherlearning.db.tar.xz
+ cache:
+ paths:
+ - local-repo/
+
check_package:
image: ${CI_REGISTRY}/personal/homelab/docker/arch-pkg-build:latest
stage: check_package
From ce6bf4352ac1040e21b8528847ae93062ddefd89 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Mon, 17 Jun 2019 16:04:55 +0000
Subject: [PATCH 8/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e10104..f3d6dac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ build_package:
- "*.pkg.tar.xz"
build_repo:
+ image: ${CI_REGISTRY}/personal/homelab/docker/arch-pkg-build:latest
state: build_repo
script:
- mkdir -p local-repo
From 44b55f59b2970e06176bd850526ce65af84853ee Mon Sep 17 00:00:00 2001
From: Ryan <ryan@ryankes.eu>
Date: Mon, 17 Jun 2019 16:05:29 +0000
Subject: [PATCH 9/9] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3d6dac..1320fce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ build_package:
build_repo:
image: ${CI_REGISTRY}/personal/homelab/docker/arch-pkg-build:latest
- state: build_repo
+ stage: build_repo
script:
- mkdir -p local-repo
- repo-add local-repo/higherlearning.db.tar.xz