Browse Source

Revive AppVeyor release builds, do not build through trigger

timvisee 6 years ago
parent
commit
f4702b7920
2 changed files with 20 additions and 13 deletions
  1. 9 9
      .gitlab-ci.yml
  2. 11 4
      appveyor.yml

+ 9 - 9
.gitlab-ci.yml

@@ -245,15 +245,15 @@ package-aur:
     - git push
     - cd ..
 
-# Trigger a release build on AppVeyor, for a Windows binary
-trigger-appveyor-release:
-  stage: package
-  only:
-    - "/^v([0-9]+\\.)*[0-9]+.*$/"
-  script:
-    - apt-get install -y --no-install-recommends curl
-    - export VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
-    - 'curl -L -H "Content-Type: application/json" -H "Authorization: Bearer $APPVEYOR_TOKEN" -d "{\"accountName\":\"timvisee\",\"projectSlug\":\"ffsend\",\"tag\":\"$CI_COMMIT_REF_NAME\",\"environmentVariables\":{\"FFSEND_VERSION\":\"$VERSION\"}}" https://ci.appveyor.com/api/builds'
+# # Trigger a release build on AppVeyor, for a Windows binary
+# trigger-appveyor-release:
+#   stage: package
+#   only:
+#     - "/^v([0-9]+\\.)*[0-9]+.*$/"
+#   script:
+#     - apt-get install -y --no-install-recommends curl
+#     - export VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
+#     - 'curl -L -H "Content-Type: application/json" -H "Authorization: Bearer $APPVEYOR_TOKEN" -d "{\"accountName\":\"timvisee\",\"projectSlug\":\"ffsend\",\"tag\":\"$CI_COMMIT_REF_NAME\",\"environmentVariables\":{\"FFSEND_VERSION\":\"$VERSION\"}}" https://ci.appveyor.com/api/builds'
 
 # # Snap release
 # snap:

+ 11 - 4
appveyor.yml

@@ -1,4 +1,10 @@
+# Only build version tags
 skip_non_tags: true
+branches:
+  only:
+    - /v\d*\.\d*\.\d*/
+
+# Build for the x86_64 Windows target
 platform: x64
 environment:
   SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem"
@@ -13,14 +19,15 @@ environment:
       OPENSSL_VERSION: 1_1_0j
       OPENSSL_DIR: C:\OpenSSL
 
+# Extract release binary artifacts
 artifacts:
 - path: .\ffsend*.exe
 
 install:
-  # Quit early if FFSEND_VESRION is not available
-  # These builds must be started from a webhook, initiated by a release build on
-  # GitLab CI
-  - ps: if ([string]::IsNullOrEmpty($FFSEND_VERSION)) { Exit-AppveyorBuild }
+  # # Quit early if FFSEND_VESRION is not available
+  # # These builds must be started from a webhook, initiated by a release build on
+  # # GitLab CI
+  # - ps: if ([string]::IsNullOrEmpty($FFSEND_VERSION)) { Exit-AppveyorBuild }
 
   # Install OpenSSL
   - mkdir C:\OpenSSL