chore: Merge alpha and beta

.github/workflows/docker.yaml

@@ -1,11 +1,13 @@
 name: Docker
 
-on: [push]
-
+on:
+  push:
+    branches:
+      - Beta
+    tags:
+      - "v*"
 env:
   REGISTRY: docker.io
-  IMAGE_NAME: '{{ env.DOCKERHUB_ACCOUNT }}/{{ env.DOCKERHUB_REPO }}'
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -23,6 +25,8 @@ jobs:
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
@@ -30,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
@@ -47,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-test
+name: Release
 on:
   push:
     tags:
@@ -35,21 +35,7 @@ jobs:
           BINDIR: bin
         run: make -j releases
 
-      - name: Delete current release assets
-        uses: andreaswilli/delete-release-assets-action@v2.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: beta
-          deleteOnlyFromDrafts: false
-
-      - name: Tag Repo
-        uses: richardsimko/update-tag@v1
-        with:
-          tag_name: beta
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload Alpha
+      - name: Upload Release
         uses: softprops/action-gh-release@v1
         if: ${{ success() && startsWith(github.ref, 'refs/tags/')}}
         with:

Dockerfile

@@ -1,41 +1,26 @@
 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
 
-WORKDIR /clash-src
+
 COPY . /clash-src
-RUN go mod download
-RUN /bin/ash -c 'set -ex && \
-    if [ "$TARGETARCH" == "amd64" ]; then \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH GOAMD64=v1 make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash-amd64v1 && \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH GOAMD64=v2 make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash-amd64v2 && \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH GOAMD64=v3 make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash-amd64v3 && \
-       ln -s clash-amd64v3 ./bin/clash-amd64v4 && \
-       mv check_amd64.sh ./bin/ && \
-       printf "#!/bin/sh\\nsh ./check_amd64.sh\\nexec ./clash-amd64v\$? \$@" > ./bin/clash && \
-       chmod +x ./bin/check_amd64.sh ./bin/clash; \
-    else \
-       GOOS=$TARGETOS GOARCH=$TARGETARCH make docker && \
-       mv ./bin/Clash.Meta-docker ./bin/clash; \
-    fi'
+WORKDIR /clash-src
+RUN go mod download &&\
+    make docker &&\
+    mv ./bin/Clash.Meta-docker /clash
+
 FROM alpine:latest
 LABEL org.opencontainers.image.source="https://github.com/MetaCubeX/Clash.Meta"
 
 RUN apk add --no-cache ca-certificates tzdata
 
 VOLUME ["/root/.config/clash/"]
-EXPOSE 7890/tcp
 
 COPY --from=builder /clash-config/ /root/.config/clash/
-COPY --from=builder /clash-src/bin/ /
+COPY --from=builder /clash /clash
+RUN chmod +x /clash
 ENTRYPOINT [ "/clash" ]

Makefile

@@ -1,7 +1,16 @@
 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)
+VERSION=beta-$(shell git rev-parse --short HEAD)
+else ifeq ($(BRANCH),HEAD)
+VERSION=$(shell git describe --tags)
+else
+VERSION=unknown
+endif
+
 BUILDTIME=$(shell date -u)
 GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \
 		-X "github.com/Dreamacro/clash/constant.BuildTime=$(BUILDTIME)" \
@@ -43,7 +52,7 @@ all:linux-amd64 linux-arm64\
  	windows-amd64 windows-arm64\
 
 docker:
-	$(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+	GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 darwin-amd64v3:
 	GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@