Update to Factorio 0.18.18

Do not stop updating process on incompatible version
Closes #308
2025-07-01 14:38:05 +02:00 · 2020-04-08 16:02:54 +00:00 · 2020-04-05 11:09:01 +02:00 · 2020-04-05 11:07:18 +02:00 · 2020-03-27 17:58:41 +00:00 · 2020-03-25 16:00:10 +00:00
5 changed files with 17 additions and 15 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 dist: xenial
 language: bash
-services: 
+services:
  - docker

 addons:
@ -29,6 +29,6 @@ jobs:
    - <<: *build
      env: VERSION_SHORT=0.14
    - <<: *build
-      if: branch = master
+      if: branch = master AND type != pull_request
      env:
      script: docker run -v $PWD:/workspace -e DOCKERHUB_USERNAME=$DOCKER_USERNAME -e DOCKERHUB_PASSWORD=$DOCKER_PASSWORD -e DOCKERHUB_REPOSITORY='factoriotools/factorio' -e README_FILEPATH='/workspace/README.md' peterevans/dockerhub-description:2.1.0
--- a/0.17/files/update-mods.sh
+++ b/0.17/files/update-mods.sh
@ -32,19 +32,20 @@ update_mod()
  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
  MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")

+  if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then
+    print_success "  Custom mod not on $MOD_BASE_URL, skipped."
+    return 0
+  fi
+
  MOD_INFO=$(echo "$MOD_INFO_JSON" | jq -j --arg version "$FACTORIO_VERSION" ".releases|reverse|map(select(.info_json.factorio_version as \$mod_version | \$version | startswith(\$mod_version)))[0]|.file_name, \";\", .download_url, \";\", .sha1")

  MOD_FILENAME=$(echo "$MOD_INFO" | cut -f1 -d";")
  MOD_URL=$(echo "$MOD_INFO" | cut -f2 -d";")
  MOD_SHA1=$(echo "$MOD_INFO" | cut -f3 -d";")

-  if [[ -z $MOD_URL ]]; then
-    return 1
-  fi
-
  if [[ $MOD_FILENAME == null ]]; then
    print_failure "  Not compatible with version"
-    return 1
+    return 0
  fi

  if [[ -f $MOD_DIR/$MOD_FILENAME ]]; then
--- a/0.18/Dockerfile
+++ b/0.18/Dockerfile
@ -9,8 +9,8 @@ ARG PGID=845

 ENV PORT=34197 \
    RCON_PORT=27015 \
-    VERSION=0.18.0 \
-    SHA1=31e87bfe1a6a3671aaca5e52e08597b2294de104 \
+    VERSION=0.18.18 \
+    SHA1=1283e42f5c001df5666ddd271cd2115f84ac9623 \
    SAVES=/factorio/saves \
    CONFIG=/factorio/config \
    MODS=/factorio/mods \
--- a/0.18/files/update-mods.sh
+++ b/0.18/files/update-mods.sh
@ -32,19 +32,20 @@ update_mod()
  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
  MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")

+  if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then
+    print_success "  Custom mod not on $MOD_BASE_URL, skipped."
+    return 0
+  fi
+
  MOD_INFO=$(echo "$MOD_INFO_JSON" | jq -j --arg version "$FACTORIO_VERSION" ".releases|reverse|map(select(.info_json.factorio_version as \$mod_version | \$version | startswith(\$mod_version)))[0]|.file_name, \";\", .download_url, \";\", .sha1")

  MOD_FILENAME=$(echo "$MOD_INFO" | cut -f1 -d";")
  MOD_URL=$(echo "$MOD_INFO" | cut -f2 -d";")
  MOD_SHA1=$(echo "$MOD_INFO" | cut -f3 -d";")

-  if [[ -z $MOD_URL ]]; then
-    return 1
-  fi
-
  if [[ $MOD_FILENAME == null ]]; then
    print_failure "  Not compatible with version"
-    return 1
+    return 0
  fi

  if [[ -f $MOD_DIR/$MOD_FILENAME ]]; then
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Factorio [![Build Status](https://travis-ci.org/factoriotools/factorio-docker.svg?branch=master)](https://travis-ci.org/factoriotools/factorio-docker) ![Updater status](https://img.shields.io/endpoint?label=Updater%20status&logo=a&url=https%3A%2F%2Fhealthchecks.supersandro.de%2Fbadge%2F1a0a7698-445d-4e54-9e4b-f61a1544e01f%2FBO8VukOA%2Fmaintainer.shields) [![Docker Version](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Microbadger Layers](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com")

-* `0.18.0`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
+* `0.18.18`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
 * `0.17.79`, `0.17`, `stable` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
 * `0.16.51`, `0.16` [(0.16/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.16/Dockerfile)
 * `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.15/Dockerfile)
Author	SHA1	Message	Date
SuperSandroBot	6da1250b5b	Update to Factorio 0.18.18	2020-04-08 16:02:54 +00:00
Sandro Jäckel	deaaf83967	Do not stop updating process on incompatible version Closes #308	2020-04-05 11:09:01 +02:00
Sandro Jäckel	9691472b84	Backport #307 to 0.17	2020-04-05 11:07:18 +02:00
SuperSandroBot	236b27d94e	Update to Factorio 0.18.17	2020-03-27 17:58:41 +00:00
SuperSandroBot	457ab79b5b	Update to Factorio 0.18.16	2020-03-25 16:00:10 +00:00
Kai	235a2abb60	Fixes #306 by skipping custom mods (#307 )	2020-03-21 12:54:27 +01:00
SuperSandroBot	c52f649b35	Update to Factorio 0.18.15	2020-03-20 15:25:07 +00:00
SuperSandroBot	52167abffa	Update to Factorio 0.18.14	2020-03-18 17:20:08 +00:00
SuperSandroBot	f20fe0ad85	Update to Factorio 0.18.13	2020-03-17 14:10:20 +00:00
SuperSandroBot	1cd2015cc4	Update to Factorio 0.18.12	2020-03-10 17:45:07 +00:00
SuperSandroBot	c4b2d30366	Update to Factorio 0.18.11	2020-03-10 15:05:07 +00:00
SuperSandroBot	5c81134430	Update to Factorio 0.18.10	2020-03-03 14:30:08 +00:00
SuperSandroBot	7d220042a9	Update to Factorio 0.18.9	2020-02-25 12:30:39 +00:00
SuperSandroBot	e61a3aa622	Update to Factorio 0.18.8	2020-02-18 18:05:11 +00:00
SuperSandroBot	773005b320	Update to Factorio 0.18.7	2020-02-18 15:15:10 +00:00
SuperSandroBot	51185620dd	Update to Factorio 0.18.6	2020-02-11 21:21:35 +00:00
SuperSandroBot	c24b7bc41b	Update to Factorio 0.18.5	2020-02-11 18:02:10 +00:00
SuperSandroBot	5301aff1b1	Update to Factorio 0.18.4	2020-02-06 14:31:36 +00:00
SuperSandroBot	502f13c1cd	Update to Factorio 0.18.3	2020-01-30 18:56:34 +00:00
SuperSandroBot	fe3d0d65bc	Update to Factorio 0.18.2	2020-01-28 14:46:33 +00:00
florian kinder	4bc30e718c	⬆️ 0.18.1	2020-01-24 10:47:48 +01:00
florian kinder	994a091595	Don't update dockerhub on pull requests	2020-01-24 10:43:25 +01:00