Use official github release action & refine workflow

1 files changed, 28 insertions, 14 deletions

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 57118fce..a5a9713e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -1,12 +1,10 @@
 name: Build geoip.dat
-
-on: 
+on:
   schedule:
     - cron: "0 0 * * 3"
   push:
     branches:
       - master
-
 jobs:
   build:
     name: Build
@@ -16,16 +14,16 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: 1.14
-        id: go
-      
+
       - name: Set GOPATH and release variables
         run: |
           echo "::set-env name=TAG_NAME::$(date +%Y%m%d%H%M)"
-          echo "::set-env name=NAME::$(date +%Y%m%d%H%M)"
+          echo "::set-env name=RELEASE_NAME::$(date +%Y%m%d%H%M)"
+          echo "::set-env name=REPO_URL::github.com/v2ray/geoip"
           echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
           echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin"
         shell: bash
-        
+
       - name: Get GeoLite2
         run: |
           curl -L "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=JvbzLLx7qBZT&suffix=zip" -o GeoLite2-Country-CSV.zip
@@ -33,15 +31,31 @@ jobs:
           rm -f GeoLite2-Country-CSV.zip
           mv GeoLite2* geoip
 
-      - name: Build
+      - name: Build geoip.dat file
         run: |
-          go get -u -v -insecure github.com/v2ray/geoip
+          go get -u -v -insecure $REPO_URL
           geoip --country=./geoip/GeoLite2-Country-Locations-en.csv --ipv4=./geoip/GeoLite2-Country-Blocks-IPv4.csv --ipv6=./geoip/GeoLite2-Country-Blocks-IPv6.csv
           mkdir ./publish
-          mv ./geoip.dat ./publish/ 
-          
-      - name: Release
-        uses: opspresso/action-release@master
+          mv ./geoip.dat ./publish/
+
+      - name: Create a release
+        id: create_release
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ASSET_PATH: publish
+        with:
+          tag_name: ${{ env.TAG_NAME }}
+          release_name: ${{ env.RELEASE_NAME }}
+          draft: false
+          prerelease: false
+
+      - name: Upload dat file
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./publish/geoip.dat
+          asset_name: geoip.dat
+          asset_content_type: application/octet-stream