From 2973c913615afbbdaeb2171b4c8686358f0a2490 Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Fri, 16 Aug 2019 13:49:49 +0000
Subject: [PATCH] Update .gitlab-ci.yml, ci/.aws/config, ci/.aws/credentials
 files

---
 .gitlab-ci.yml      | 16 +++++++++++++++-
 ci/.aws/config      | 14 ++++++++++++++
 ci/.aws/credentials |  3 +++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 ci/.aws/config
 create mode 100644 ci/.aws/credentials

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6da7d337..24ed4f99c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,11 +12,25 @@ build-flatpak:
     - flatpak-builder --force-clean --ccache --repo=repo build-dir org.eu.encom.spectral.yaml
     - flatpak build-bundle repo spectral.flatpak org.eu.encom.spectral
     - cd ../
+    - mv flatpak/spectral.flatpak ./spectral-$(git rev-list --count HEAD).flatpak
   cache:
     key: "flatpak-$CI_COMMIT_REF_SLUG"
     paths:
     - flatpak/.flatpak-builder
   artifacts:
     paths:
-    - flatpak/spectral.flatpak
+    - "*.flatpak"
 
+deploy-flatpak:
+  image: python:3-alpine
+  stage: deploy
+  before_script:
+    - pip3 install awscli
+    - pip3 install awscli-plugin-endpoint
+    - cp -R .aws ~/
+    - sed -i -e "s/REGION/$REGION/g" ~/.aws/config
+    - sed -i -e "s/ENDPOINT_URL/$ENDPOINT_URL/g" ~/.aws/config
+    - sed -i -e "s/AWS_ACCESS_KEY_ID/$AWS_ACCESS_KEY_ID/g" ~/.aws/credentials
+    - sed -i -e "s/AWS_SECRET_ACCESS_KEY/$AWS_SECRET_ACCESS_KEY/g" ~/.aws/credentials
+  script:
+    - aws s3 cp *.flatpak s3://$BUCKET_NAME
diff --git a/ci/.aws/config b/ci/.aws/config
new file mode 100644
index 000000000..7c11c1bd6
--- /dev/null
+++ b/ci/.aws/config
@@ -0,0 +1,14 @@
+[plugins]
+endpoint = awscli_plugin_endpoint
+
+[default]
+region = REGION
+s3 =
+  endpoint_url = ENDPOINT_URL
+  signature_version = s3v4  
+  max_concurrent_requests = 1000
+  max_queue_size = 10000
+  multipart_threshold = 50MB
+  multipart_chunksize = 10MB
+s3api =
+  endpoint_url = ENDPOINT_URL
\ No newline at end of file
diff --git a/ci/.aws/credentials b/ci/.aws/credentials
new file mode 100644
index 000000000..738e8e6bd
--- /dev/null
+++ b/ci/.aws/credentials
@@ -0,0 +1,3 @@
+[default]
+aws_access_key_id=AWS_ACCESS_KEY_ID
+aws_secret_access_key=AWS_SECRET_ACCESS_KEY
\ No newline at end of file