Merge branch 'main' of https://gitlab.com/onomanapeia/peachmoon

merge for some data

.gitlab-ci.yml

@@ -1,55 +1,24 @@
-stages:
-  - deploy
-
-default:
-  image: debian:stable-slim
-  tags:
-    - docker
-
-variables:
-  # The runner will be able to pull your Zola theme when the strategy is
-  # set to "recursive".
-  GIT_SUBMODULE_STRATEGY: "recursive"
-
-  # If you don't set a version here, your site will be built with the latest
-  # version of Zola available in GitHub releases.
-  # Use the semver (x.y.z) format to specify a version. For example: "0.17.2" or "0.18.0".
-  ZOLA_VERSION:
-    description: "The version of Zola used to build the site."
-    value: ""
-
+# The Docker image that will be used to build your app
+image: debian:stable-slim
+# Functions that should be executed before the build script is run
+before_script: []
 pages:
-  stage: deploy
   script:
-    - |
-      apt-get update --assume-yes && apt-get install --assume-yes --no-install-recommends wget ca-certificates
-      if [ $ZOLA_VERSION ]; then
-        zola_url="https://github.com/getzola/zola/releases/download/v$ZOLA_VERSION/zola-v$ZOLA_VERSION-x86_64-unknown-linux-gnu.tar.gz"
-        if ! wget --quiet --spider $zola_url; then
-          echo "A Zola release with the specified version could not be found.";
-          exit 1;
-        fi
-      else
-        github_api_url="https://api.github.com/repos/getzola/zola/releases/latest"
-        zola_url=$(
-          wget --output-document - $github_api_url |
-          grep "browser_download_url.*linux-gnu.tar.gz" |
-          cut --delimiter : --fields 2,3 |
-          tr --delete "\" "
-        )
-      fi
-      wget $zola_url
-      tar -xzf *.tar.gz
-      ./zola build
-
+    - '- |       apt-get update --assume-yes && apt-get install --assume-yes
+      --no-install-recommends wget ca-certificates       if [ $ZOLA_VERSION ];
+      then         zola_url="https://github.com/getzola/zola/releases/download/v$ZOLA_VERSION/zola-v$ZOLA_VERSION-x86_64-unknown-linux-gnu.tar.gz"         if
+      ! wget --quiet --spider $zola_url; then           echo "A Zola release
+      with the specified version could not be found.";           exit
+      1;         fi       else         github_api_url="https://api.github.com/repos/getzola/zola/releases/latest"         zola_url=$(           wget
+      --output-document - $github_api_url |           grep
+      "browser_download_url.*linux-gnu.tar.gz" |           cut --delimiter :
+      --fields 2,3 |           tr --delete "\" "         )       fi       wget
+      $zola_url       tar -xzf *.tar.gz       ./zola build'
   artifacts:
     paths:
-      # This is the directory whose contents will be deployed to the GitLab Pages
-      # server.
-      # GitLab Pages expects a directory with this name by default.
+      # The folder that contains the files to be exposed at the Page URL
       - public
-
   rules:
-    # This rule makes it so that your website is published and updated only when
-    # you push to the default branch of your repository (e.g. "master" or "main").
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    # This ensures that only pushes to the default branch will trigger
+    # a pages deploy
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH