chore: Merge alpha and beta

.github/workflows/docker.yaml

@@ -6,11 +6,8 @@ on:
       - Beta
     tags:
       - "v*"
-
 env:
   REGISTRY: docker.io
-  IMAGE_NAME: '{{ env.DOCKERHUB_ACCOUNT }}/{{ env.DOCKERHUB_REPO }}'
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -37,15 +34,15 @@ jobs:
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ secrets.DOCKERHUB_ACCOUNT }}/${{secrets.DOCKERHUB_REPO}}
 
-      - name: Log into registry ${{ env.REGISTRY }}
+      - name: Log into registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -54,6 +51,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
+          file: ./Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           platforms: |
             linux/386

.github/workflows/prerelease.yml

@@ -1,4 +1,4 @@
-name: prerelease
+name: Prerelease
 on:
   push:
     branches:
@@ -31,10 +31,13 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
+
+
       - name: Test
         if: ${{env.GITHUB_REF_NAME=='Beta'}}
         run: |
           go test ./...
+
       - name: Build
         if: success()
         env:
@@ -46,13 +49,13 @@ jobs:
         uses: andreaswilli/delete-release-assets-action@v2.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ env.GITHUB_REF_NAME }}
+          tag: Prerelease-${{env.GITHUB_REF_NAME}}
           deleteOnlyFromDrafts: false
 
       - name: Tag Repo
         uses: richardsimko/update-tag@v1
         with:
-          tag_name: ${{env.GITHUB_REF_NAME}}
+          tag_name: Prerelease-${{env.GITHUB_REF_NAME}}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -61,7 +64,7 @@ jobs:
         if: ${{  success() }}
         with:
           tag: ${{env.GITHUB_REF_NAME}}
-          tag_name: ${{env.GITHUB_REF_NAME}}
+          tag_name: Prerelease-${{env.GITHUB_REF_NAME}}
           files: bin/*
           prerelease: true
           generate_release_notes: true

.github/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: release
+name: Release
 on:
   push:
     tags:

Dockerfile

@@ -1,13 +1,11 @@
 FROM golang:alpine as builder
 
-ARG TARGETOS
-ARG TARGETARCH
-
 RUN apk add --no-cache make git && \
     mkdir /clash-config && \
     wget -O /clash-config/Country.mmdb https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb && \
     wget -O /clash-config/geosite.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat && \
-    wget -O /clash-config/geoip.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat \
+    wget -O /clash-config/geoip.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
+
 
 COPY . /clash-src
 WORKDIR /clash-src

Makefile

@@ -1,6 +1,6 @@
 NAME=Clash.Meta
 BINDIR=bin
-BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
+BRANCH=$(shell git branch --show-current)
 ifeq ($(BRANCH),Alpha)
 VERSION=alpha-$(shell git rev-parse --short HEAD)
 else ifeq ($(BRANCH),Beta)