Merge branch 'dev'

syphon-org · Dec 27, 2021 · addd7f0 · addd7f0
2 parents c18633e + 288b762
commit addd7f0
Showing 1 changed file with 39 additions and 17 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -38,16 +38,16 @@ steps:
       - cp build/app/outputs/flutter-apk/app-release.apk ./syphon.nightly.android.apk
 
   - name: release android
-    image: golang:1.17
+    image: golang:1.15
     environment:
       GITEA_SERVER_TOKEN:
         from_secret: GITEA_API_TOKEN
     commands:
       # Modify the existing release and add the android apk
-      - go install code.gitea.io/tea@latest
+      - go get code.gitea.io/tea
+      - go install code.gitea.io/tea
       - tea login add -u https://git.syphon.org -n syphon
       - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-android" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-nightly-android" --asset ./syphon.nightly.android.apk
-
 ---
 kind: pipeline
 type: docker
@@ -90,13 +90,14 @@ steps:
       - cp build/app/outputs/flutter-apk/app-release.apk ./syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).android.apk
 
   - name: release android
-    image: golang:1.17
+    image: golang:1.15
     environment:
       GITEA_SERVER_TOKEN:
         from_secret: GITEA_API_TOKEN
     commands:
       # Modify the existing release and add the android apk
-      - go install code.gitea.io/tea@latest
+      - go get code.gitea.io/tea
+      - go install code.gitea.io/tea
       - tea login add -u https://git.syphon.org -n syphon
       - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-android" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-android" --asset ./syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).android.apk
 ---
@@ -131,14 +132,14 @@ steps:
       - tar -cvzf syphon.nightly.linux.x64.tar.gz -C build/linux/x64/release/bundle .
 
   - name: release linux
-    image: golang:1.17
+    image: golang:1.15
     environment:
       GITEA_SERVER_TOKEN:
         from_secret: GITEA_API_TOKEN
     commands:
-      # Create a build timestamp for the release title
-      - echo $(date -Iseconds) > BUILD_START_TIME
-      - go install code.gitea.io/tea@latest
+      # Modify the existing release and add the android apk
+      - go get code.gitea.io/tea
+      - go install code.gitea.io/tea
       - tea login add -u https://git.syphon.org
       - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-linux" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-nightly-linux" --asset ./syphon.nightly.linux.x64.tar.gz
 ---
@@ -173,14 +174,14 @@ steps:
       - tar -cvzf syphon.nightly.linux.x64.tar.gz -C build/linux/x64/release/bundle .
 
   - name: release linux
-    image: golang:1.17
+    image: golang:1.15
     environment:
       GITEA_SERVER_TOKEN:
         from_secret: GITEA_API_TOKEN
     commands:
-      # Create a build timestamp for the release title
-      - echo $(date -Iseconds) > BUILD_START_TIME
-      - go install code.gitea.io/tea@latest
+      # Modify the existing release and add the android apk
+      - go get code.gitea.io/tea
+      - go install code.gitea.io/tea
       - tea login add -u https://git.syphon.org
       - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-linux" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-nightly-linux" --asset ./syphon.nightly.linux.x64.tar.gz
 ---
@@ -216,13 +217,34 @@ steps:
       - tar -cvzf syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).linux.x64.tar.gz -C build/linux/x64/release/bundle .
 
   - name: release linux
-    image: golang:1.17
+    image: golang:1.15
     environment:
       GITEA_SERVER_TOKEN:
         from_secret: GITEA_API_TOKEN
     commands:
-      # Create a build timestamp for the release title
-      - echo $(date -Iseconds) > BUILD_START_TIME
-      - go install code.gitea.io/tea@latest
+      # Modify the existing release and add the android apk
+      - go get code.gitea.io/tea
+      - go install code.gitea.io/tea
       - tea login add -u https://git.syphon.org
       - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-linux" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-linux" --asset ./syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).linux.x64.tar.gz
+# ---
+# TODO: Remove to test Tea updates
+# kind: pipeline
+# type: docker
+# name: test release
+# trigger:
+#   event:
+#     - push
+# steps:
+#   - name: release test
+#     image: golang:1.17
+#     environment:
+#       GITEA_SERVER_TOKEN:
+#         from_secret: GITEA_API_TOKEN
+#     commands:
+#       - go install code.gitea.io/tea@latest
+#       - tea --version
+#       - which tea
+#       - tea login add -u https://git.syphon.org
+#       - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-linux" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-linux" --asset ./syphon.testing.linux.x64.tar.gz
+# ---