Gitlab to use proxy instead of copy

Author: fileformat

Diff for: .github/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Deploy to Workers Prod
+name: build
 
 on:
   push:
@@ -25,6 +25,9 @@ jobs:
       - name: Build Github Index
         run: ./build-github.sh
 
+      - name: Build Gitlab Index
+        run: ./build-gitlab.sh
+
       - run: echo "::set-env name=RELEASE_DATE::$(date -u +%Y-%m-%dT%H:%M:%SZ)"
       - run: echo "::set-env name=RELEASE_TAG::$(date -u +%Y%m%d-%H%M%S)"
       - run: echo "Release date is ${{ env.RELEASE_DATE }}"
@@ -42,8 +45,8 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload .tgz
-        id: upload
+      - name: Upload Github .tgz
+        id: upload_github
         uses: actions/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -52,3 +55,14 @@ jobs:
           asset_path: ./build/sourceData-github.tgz
           asset_name: sourceData-github.tgz
           asset_content_type: application/gzip
+
+      - name: Upload Gitlab .tgz
+        id: upload_gitlab
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: ./build/sourceData-gitlab.tgz
+          asset_name: sourceData-gitlab.tgz
+          asset_content_type: application/gzip

Diff for: bin/loadrepo.py

@@ -82,23 +82,23 @@
     if repodata['provider'] == 'github':
         giturl = "https://github.com/" + repodata['repo']
     elif repodata['provider'] == 'gitlab':
-        giturl = "https://gitlab.com/" + repodata['repo']
+        giturl = "https://gitlab.com/" + repodata['repo'] + ".git/"
     else:
         sys.stderr.write("ERROR: unknown or missing provider '%s'\n" % repodata['provider'])
         sys.exit(3)
 
     if os.path.isdir(gitdir):
         os.chdir(gitdir)
 
-        cached_commit = sh.git("rev-parse", "HEAD", "--", _err_to_out=True, _out=sys.stdout)
+        cached_commit = sh.git("rev-parse", "HEAD", "--", _err_to_out=True)
 
         if args.verbose:
             sys.stdout.write("INFO: pulling changes from git repo %s\n" % giturl)
         sh.git.pull("origin", repodata["branch"], _err_to_out=True, _out=sys.stdout)
         if args.verbose:
             sys.stdout.write("INFO: pull complete\n")
 
-        current_commit = sh.git("rev-parse", "HEAD", _err_to_out=True, _out=sys.stdout)
+        current_commit = sh.git("rev-parse", "HEAD", _err_to_out=True)
         if cached_commit == current_commit:
             if args.always:
                 sys.stdout.write("INFO: no changes to repo since last run but processing anyway\n")
@@ -136,8 +136,8 @@
         sys.stdout.write("INFO: switching to branch '%s'\n" % (repodata['branch']))
     sh.git.checkout(repodata['branch'], _err_to_out=True, _out=sys.stdout)
 
-    current_commit = sh.git("rev-parse", "HEAD", _err_to_out=True, _out=sys.stdout)
-    last_mod = "%s" % sh.git.log("-1", "--format=%cd", "--date=iso", _tty_out=False)
+    current_commit = sh.git("rev-parse", "HEAD", _err_to_out=True)
+    last_mod = ("%s" % sh.git.log("-1", "--format=%cd", "--date=iso", _tty_out=False)).strip()
     sys.stdout.write("INFO: last modified on %s\n" % last_mod)
 
     logodir = os.path.join(gitdir, repodata['directory'])
@@ -208,9 +208,10 @@
                 sys.stdout.write("DEBUG: repo %s copy from '%s' to '%s' (%s)\n" % (repo_handle, str(srcpath), dstpath, shortpath))
 
             imgurl = args.cdnprefix + shortpath
-        else:
+        elif args.provider == 'github':
             imgurl = "https://raw.githubusercontent.com/" + repodata["repo"] + "/" + repodata["branch"] + srcpath[len(gitdir):]
-
+        elif args.provider == 'gitlab':
+            imgurl = "https://gitlab.svg.zone/" + repodata["repo"] + "/raw/" + repodata["branch"] + srcpath[len(gitdir):]
 
         images.append({
             'name': name,

Diff for: build-gitlab.sh

@@ -25,7 +25,7 @@ OUTPUT_DIR=${LOCAL_DIR:-./remote}
 #
 echo "INFO: loading logos into ${OUTPUT_DIR}"
 ./bin/loadrepo.py \
-    --cdnprefix=${CDN_PREFIX} \
+    --nocopy \
     --output=${OUTPUT_DIR} \
     --provider=gitlab