Add upload to S3 action

Author: libre-man

.github/workflows/deploy.yml

@@ -12,10 +12,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, macos-10.15, ubuntu-18.04]
+        os:
+          - windows-2019
+          - macos-10.15
+          - ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
 
+      - name: Install node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '12'
+
       - name: Setup Python for Ubuntu
         run: |
           sudo apt-get install -y \
@@ -24,25 +32,20 @@ jobs:
             python3-distutils python3-setuptools python3-wheel python3-stdeb
         if: startsWith(matrix.os, 'ubuntu')
 
-      - name: Setup Python for not Ubuntu
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.6
-        if: startsWith(matrix.os, 'ubuntu') == false
-
-      - name: Install node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '12'
-
-      - name: Build binary for ubuntu
+      - name: Build binary for Ubuntu
         run: |
           python3 -m venv env
           source env/bin/activate
           make build-quick
         if: startsWith(matrix.os, 'ubuntu')
 
-      - name: Build binary for not ubuntu
+      - name: Setup Python for not Ubuntu
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.6
+        if: startsWith(matrix.os, 'ubuntu') == false
+
+      - name: Build binary for not Ubuntu
         run: make build-quick
         if: startsWith(matrix.os, 'ubuntu') == false
 
@@ -52,6 +55,43 @@ jobs:
           path: |
             dist/*.pkg
             dist/*.exe
-            dist/*.bash
+            dist/install_linux.bash
             dist/*.deb
           if-no-files-found: error
+          retention-days: 1
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_S3_FS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_S3_FS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: ./dist
+
+      - name: Set version
+        run: |
+          echo "VERSION=v$(jq --raw-output .version < package.json)" >> $GITHUB_ENV
+          echo "S3_CP=aws s3 cp --acl public-read" >> $GITHUB_ENV
+          echo "S3_SYNC=aws s3 sync --acl public-read" >> $GITHUB_ENV
+
+      - name: Upload fs to S3
+        run: |
+          $S3_CP dist/ubuntu*/install_linux.bash s3://codegradefs/$VERSION/install_linux.bash
+          $S3_CP dist/ubuntu*/python3-fusepy*.deb s3://codegradefs/$VERSION/linux/python3-fusepy.deb
+          $S3_CP dist/ubuntu*/python3-codegrade-fs*_all.deb s3://codegradefs/$VERSION/linux/python3-codegrade-fs_all.deb
+          $S3_CP dist/ubuntu*/codegrade-fs*_amd64.deb s3://codegradefs/$VERSION/linux/codegrade-fs_amd64.deb
+          $S3_CP dist/ubuntu*/codegrade-fs*_i386.deb s3://codegradefs/$VERSION/linux/codegrade-fs_i386.deb
+
+          $S3_CP dist/windows*/*.exe s3://codegradefs/$VERSION/codegrade_filesystem_installer.exe
+          $S3_CP dist/mac*/*.pkg s3://codegradefs/$VERSION/codegrade_filesystem_installer.pkg

.scripts/make_install_linux_script.py

@@ -6,7 +6,7 @@
 
 TEMPLATE = """
 #!/bin/bash
-BASE_URL="https://codegradefs.s3-eu-west-1.amazonaws.com/v{{VERSION}}"
+BASE_URL="https://fs.codegrade.com/v{{VERSION}}/linux"
 
 err_echo() {
     (>&2 echo "$@")
@@ -78,13 +78,9 @@
     trap '[[ -n $tmpdir ]] && rm -rf "$tmpdir"' 0 1 2 3 15
 
     printf "\\\\nDownloading all needed files\\\\n"
-    download_file "${BASE_URL}/linux/python3-fusepy_NEWEST-1_all.deb" "$tmpdir/fusepy.deb"
-    if is_distro "Debian"; then
-        download_file "${BASE_URL}/debian/python3-codegrade-fs_all.deb" "$tmpdir/backend.deb"
-    else
-        download_file "${BASE_URL}/ubuntu/python3-codegrade-fs_all.deb" "$tmpdir/backend.deb"
-    fi
-    download_file "${BASE_URL}/linux/codegrade-fs_$(get_arch).deb" "$tmpdir/frontend.deb"
+    download_file "${BASE_URL}/python3-fusepy.deb" "$tmpdir/fusepy.deb"
+    download_file "${BASE_URL}/python3-codegrade-fs_all.deb" "$tmpdir/backend.deb"
+    download_file "${BASE_URL}/codegrade-fs_$(get_arch).deb" "$tmpdir/frontend.deb"
 
     if _pip list | grep -- 'CodeGra.fs'; then
         printf "\\\\nRemoving old versions\\\\n"

codegra_fs/constants.py

@@ -16,7 +16,7 @@
 mountpoint_help = """Mountpoint for the file system. This should be an existing
 empty directory."""
 
-password_help = """Your CodeGra.de password, don't pass this option if you want
+password_help = """Your CodeGrade password, don't pass this option if you want
 to pass your password over stdin. You can also use the `CGFS_PASSWORD`
 environment variable to pass your password."""
 

codegra_fs/utils.py

@@ -63,10 +63,13 @@ def get_fuse_install_message() -> t.Optional[t.Tuple[str, t.Optional[str]]]:
 
 
 def newer_version_available() -> bool:
-    req = requests.get('https://codegra.de/.cgfs.version', timeout=2)
-    return req.status_code < 300 and tuple(
-        int(p) for p in req.content.decode('utf8').strip().split('.')
-    ) > codegra_fs.__version__
+    try:
+        req = requests.get('https://fs.codegrade.com/.cgfs.json', timeout=2)
+        req.raise_for_status()
+        latest = tuple(map(int, req.json()['version']))
+    except:
+        return False
+    return latest > codegra_fs.__version__
 
 
 def find_all_dups(

docs/install.rst

@@ -2,7 +2,8 @@ Installation
 =============
 The CodeGrade Filesystem is an external application that can be installed on
 :fa:`windows` Windows, :fa:`apple` MacOS and :fa:`linux` Debian/Ubuntu.  To install
-it go to `The CodeGrade website <https://codegra.de/filesystem/>`__ and follow
+it go to `The CodeGrade website
+<https://www.codegrade.com/download-codegrade-filesystem>`__ and follow
 the instructions there.
 
 Dependencies