fix: one file got copied wrongly

acisops · Feb 13, 2020 · ada550a · ada550a
1 parent cb72474
commit ada550a
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,29 +1,44 @@
-name: Release
+name: Conda build
 on:
+  push:
+    branches:
+    - master
   release:
     types:
-      - created
+    - created
+  repository_dispatch:
+    types:
+    - conda-build
 
 jobs:
-  patch-release:
+  build-linux:
     runs-on: ubuntu-latest
-    name: Patch Release
+    name: Build on Linux
     steps:
-    - name: Fetch Skare3 Tools
-      uses: actions/checkout@v2
+    - name: Login to GitHub Package Registry
+      run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
+    - name: Pull Docker image
+      run: docker pull docker.pkg.github.com/sot/skare3/centos5-builder:latest
+    - name: Build
+      id: build
+      run: >
+        docker run --rm  --name builder -v $GITHUB_WORKSPACE:/github/workspace -w /github/workspace
+        -e CONDA_PASSWORD -e GIT_USERNAME -e GIT_PASSWORD
+        docker.pkg.github.com/sot/skare3/centos5-builder:latest
+        ${GITHUB_REPOSITORY} --tag ${GITHUB_SHA}
+      env:
+        CONDA_PASSWORD: ${{ secrets.CONDA_PASSWORD }}
+        GIT_USERNAME: chandra-xray
+        GIT_PASSWORD: ${{ secrets.CHANDRA_XRAY_TOKEN }}
+        GIT_ASKPASS: /home/aca/git_pass.py
+    - uses: sot/skare3_tools/actions/gdrive_upload@master
+      name: Upload to Google Drive
       with:
-        repository: sot/skare3_tools
-        ref: master
-        path: skare3_tools
-    - name: Release Description and Skare3 Issue
-      run: |
-        sudo -H pip3 install setuptools wheel
-        sudo -H pip3 install -r ./skare3_tools/requirements.txt
-        sudo -H pip3 install ./skare3_tools
-        echo skare3-release-merge-info --user $GITHUB_ACTOR --repository $GITHUB_REPOSITORY --sha $GITHUB_SHA
-        export GITHUB_PASSWORD=${{ secrets.GITHUB_TOKEN }}
-        skare3-release-merge-info --user $GITHUB_ACTOR --repository $GITHUB_REPOSITORY --sha $GITHUB_SHA
-        export GITHUB_PASSWORD=${{ secrets.CHANDRA_XRAY_TOKEN }}
-        echo skare3-create-issue --user chandra-xray --repository sot/skare3 --latest-release $GITHUB_REPOSITORY --label 'Package update'
-        skare3-create-issue --user chandra-xray --repository sot/skare3 --latest-release $GITHUB_REPOSITORY --label 'Package update'
-        echo done
+        files: |
+          builds/linux-64
+          builds/noarch
+        directory: /ska3/conda-test
+        options: --drive=cxc_ops
+      env:
+        GOOGLE_DRIVE_CREDENTIALS: ${{ secrets.GOOGLE_DRIVE_CREDENTIALS }}
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,29 @@
+name: Release
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  patch-release:
+    runs-on: ubuntu-latest
+    name: Patch Release
+    steps:
+    - name: Fetch Skare3 Tools
+      uses: actions/checkout@v2
+      with:
+        repository: sot/skare3_tools
+        ref: master
+        path: skare3_tools
+    - name: Release Description and Skare3 Issue
+      run: |
+        sudo -H pip3 install setuptools wheel
+        sudo -H pip3 install -r ./skare3_tools/requirements.txt
+        sudo -H pip3 install ./skare3_tools
+        echo skare3-release-merge-info --user $GITHUB_ACTOR --repository $GITHUB_REPOSITORY --sha $GITHUB_SHA
+        export GITHUB_PASSWORD=${{ secrets.GITHUB_TOKEN }}
+        skare3-release-merge-info --user $GITHUB_ACTOR --repository $GITHUB_REPOSITORY --sha $GITHUB_SHA
+        export GITHUB_PASSWORD=${{ secrets.CHANDRA_XRAY_TOKEN }}
+        echo skare3-create-issue --user chandra-xray --repository sot/skare3 --latest-release $GITHUB_REPOSITORY --label 'Package update'
+        skare3-create-issue --user chandra-xray --repository sot/skare3 --latest-release $GITHUB_REPOSITORY --label 'Package update'
+        echo done