Merge branch 'master' of https://github.com/YouROK/TorrServer

.gitlab-ci.yml

@@ -0,0 +1,24 @@
+stages:
+  - build_go
+
+build_go:
+  image: golang:latest
+  stage: build_go
+  when: manual
+  tags:
+    - amd64
+  artifacts:
+    name: "TorrServer"
+    paths:
+      - dist
+  script:
+    - apt update
+    - apt install -y npm zip
+    - rm -rf /var/lib/apt/lists/*
+    - npm install -g yarn
+    - wget -q "https://dl.google.com/android/repository/android-ndk-r25c-linux.zip"
+    - unzip ./android-ndk-r25c-linux.zip
+    - rm ./android-ndk-r25c-linux.zip
+    - pwd
+    - ls -l
+    - ./build-all.sh

build-all.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 PLATFORMS=(
+  'linux/amd64'
   'linux/arm64'
   'linux/arm7'
-  'linux/amd64'
   'linux/arm5'
   'linux/386'
   'windows/amd64'
@@ -90,9 +90,9 @@ declare -a COMPILERS=(
   "amd64:x86_64-linux-android21-clang"
 )
 
-export NDK_VERSION="23.1.7779620" # 25.1.8937393
+export NDK_VERSION="25.2.9519653" # 25.1.8937393
-export NDK_TOOLCHAIN=${ANDROID_HOME}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/darwin-x86_64
+#export NDK_TOOLCHAIN=${ANDROID_HOME}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/darwin-x86_64
-
+export NDK_TOOLCHAIN="${PWD}/../android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64"
 GOOS=android
 
 for V in "${COMPILERS[@]}"; do

server/rutor/rutor.go

@@ -131,8 +131,6 @@ func loadDB() {
 			err = dec.Decode(&torr)
 			if err == nil {
 				ftorrs = append(ftorrs, torr)
-			} else {
-				log.TLogln("Error read rutor db:", err)
 			}
 		}
 		torrs = ftorrs