fix: url required issue.

fix: Canvas reused issue.
Changelog for v123020572 [CI SKIP]
2023-03-03 20:39:33 +01:00 · 2023-03-03 20:39:20 +01:00 · 2023-02-26 19:13:41 +00:00 · 2023-02-26 16:05:26 +01:00 · 2023-02-26 15:40:58 +01:00 · 2023-02-26 07:49:16 +00:00
117 changed files with 4541 additions and 3687 deletions
@@ -3,24 +3,35 @@ type: docker
 name: test

 steps:
-  - name: AnylyseBuildTest
+  - name: BuildAndTest
    image: mingc/android-build-box:latest
    commands:
      - echo "---------------------------------------------------------"
-      - echo "Analysing..."
-      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\""
+      - echo "Configure gradle..."
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
      - echo "---------------------------------------------------------"
      - echo "Building..."
-      - ./gradlew :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew build -x test
      - echo "---------------------------------------------------------"
      - echo "Testing..."
      - echo "---------------------------------------------------------"
-      - ./gradlew test -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew koverMergedXmlReport
    environment:
+      TZ: Europe/Paris
      SONAR_HOST_URL:
        from_secret: sonarScannerHostUrl
      SONAR_LOGIN:
        from_secret: sonarScannerLogin
+  - name: Analyse
+    image: kytay/sonar-node-plugin
+    settings:
+      sonar_host:
+        from_secret: sonarScannerHostUrl
+      sonar_token:
+        from_secret: sonarScannerLogin
+      use_node_version: 16.18.1
+      sonar_debug: true
+      sonar_project_settings: ./sonar-project.properties
 trigger:
  event:
    - push
@@ -32,14 +43,23 @@ type: docker
 name: Publish

 steps:
-  - name: createTag
+  - name: createTagAndChangelog
    image: ubuntu:latest
    commands:
      - apt-get update && apt-get install -y git
+      - git fetch --tags -p
+      - PREV=$(git describe --tags --abbrev=0)
      - ./build.sh --publish --from-ci
      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
+      - VER=$(git describe --tags --abbrev=0)
+      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+      - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+      - git add CHANGELOG.md
+      - git commit -m "Changelog for $VER [CI SKIP]"
+      - git push pushing master
      - git push pushing --tags
    environment:
+      TZ: Europe/Paris
      GITEA_USR:
        from_secret: giteaUsr
      GITEA_PASS:
@@ -65,10 +85,7 @@ steps:
        from_secret: privateKey
      command_timeout: 2m
      script:
-        - cd /home/ubuntu
-        - sudo rm -rf /var/www/amine/version.txt
-        - sudo chown www-data:www-data ./version.txt
-        - sudo mv version.txt /var/www/amine/
+        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/

 trigger:
  event:
@@ -85,8 +102,15 @@ steps:
  - name: build
    image: mingc/android-build-box:latest
    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Fetch tags..."
+      - git fetch --tags
+      - echo "---------------------------------------------------------"
+      - echo "Configure gradle..."
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - echo "---------------------------------------------------------"
      - echo "Generate APK"
-      - ./gradlew :androidApp:assembleGithubConfigRelease -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false
      - echo "---------------------------------------------------------"
      - echo "Get Key"
      - wget https://amine-louveau.fr/key
@@ -100,6 +124,7 @@ steps:
      - echo "Verify"
      - $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
    environment:
+      TZ: Europe/Paris
      YOUR_KEYSTORE_PASSWORD:
        from_secret: keyPass
      YOUR_KEY_ALIAS:
Internal Server Error - Amine's git
	
	
	




	
		
			
				
					
						
					
				
				
					
				
			
		
		
		
			
				
				
					500 Internal Server Error
					
					
						Gitea Version: 1.28.0+dev-215-g805697089e