Merge pull request #1071 from plague006/gh_actions

Change CI from travis to GitHub Actions, change nightly releases to monthly

.github/workflows/CI.yml

@@ -0,0 +1,29 @@
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the develop branch
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Use "Factorio Mod luacheck" from the marketplace
+    - name: Factorio Mod luacheck
+      uses: Roang-zero1/factorio-mod-luacheck@v1.1.0
+      with:
+          # URL to the luacheckrc configuration file to be used during checking.
+          # Per https://github.com/Roang-zero1/factorio-mod-luacheck/issues/2 - an empty string will use the project's .luacheckrc
+          luacheckrc_url: "" # optional, default is https://raw.githubusercontent.com/Nexela/Factorio-luacheckrc/0.17/.luacheckrc

.travis.yml

@@ -5,7 +5,6 @@ env:
     - LUA="lua=5.2"
 branches:
   only:
-    - master
     - develop
 before_install:
   - pip install hererocks
@@ -23,10 +22,10 @@ before_deploy:
   - export DATE_FORMATTED
   - COMMIT_SHA=$(git log --format=%h -1)
   - export COMMIT_SHA
-  - TRAVIS_TAG="nightly/"$DATE_FORMATTED-$COMMIT_SHA
+  - TRAVIS_TAG="monthly/"$DATE_FORMATTED-$COMMIT_SHA
   - export TRAVIS_TAG
   - git tag "$TRAVIS_TAG"
-  - RELEASE_NAME='Nightly release - '"$DATE_FORMATTED"' - '"$COMMIT_SHA"
+  - RELEASE_NAME='Monthly release - '"$DATE_FORMATTED"' - '"$COMMIT_SHA"
   - export RELEASE_NAME
   - ./.travis/release_builder.sh
 deploy:

map_gen/maps/danger_ores.lua

@@ -14,15 +14,15 @@ ScenarioInfo.set_map_name('Danger Ores')
 ScenarioInfo.set_map_description(
     [[
 Clear the ore to expand the base:
-build extensive mining efforts, create large smelting arrays, 
+build extensive mining efforts, create large smelting arrays,
 use proper material ratios, and defend from enemies!
 ]]
 )
 ScenarioInfo.add_map_extra_info(
     [[You may not build the factory on ore patches. Exceptions:
  [item=burner-mining-drill] [item=electric-mining-drill] [item=pumpjack] [item=small-electric-pole] [item=medium-electric-pole] [item=big-electric-pole] [item=substation] [item=car] [item=tank]
- [item=transport-belt] [item=fast-transport-belt] [item=express-transport-belt]  [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt]]]
-) 
+ [item=transport-belt] [item=fast-transport-belt] [item=express-transport-belt]  [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt] ]]
+)
 
 local oil_seed
 local uranium_seed

map_gen/maps/diggy/feature/alien_spawner.lua

@@ -76,7 +76,7 @@ local do_alien_mining = Token.register(function(params)
 
         for rock_index = rock_count, 1, -1 do
             local rock = rocks[rock_index]
-            raise_event(defines.events.script_raised_destroy, {entity = rock, cause = "alien_emerges"}) 
+            raise_event(defines.events.script_raised_destroy, {entity = rock, cause = "alien_emerges"})
             destroy_rock(create_particle, particle_count, rock.position)
             rock.destroy()
         end

map_gen/maps/diggy/feature/diggy_cave_collapse.lua

@@ -288,7 +288,7 @@ local function script_raised_destroy(event)
     local name = entity.name
     local strength = support_beam_entities[name]
     if strength then
-        stress_map_add(entity.surface, entity.position, strength, false, player_index)
+        stress_map_add(entity.surface, entity.position, strength, false, player_index) -- luacheck: ignore 113
     end
 end
 

map_gen/maps/diggy/feature/simple_room_generator.lua

@@ -13,7 +13,6 @@ local pairs = pairs
 local perlin_noise = require 'map_gen.shared.perlin_noise'.noise
 local template_insert = Template.insert
 local set_timeout_in_ticks = Task.set_timeout_in_ticks
-local on_entity_died = defines.events.on_entity_died
 -- this
 local SimpleRoomGenerator = {}
 

map_gen/maps/grid_bot_islands.lua

@@ -13,7 +13,7 @@ local Retailer = require 'features.retailer'
 
 -- stop standard market from spawning
 local config = global.config
-config.market.create_standard_market = false 
+config.market.create_standard_market = false
 
 --change surface settings to remove oil, cliffs, etc
 local RS = require 'map_gen.shared.redmew_surface'

map_gen/maps/maze_with_rooms.lua

@@ -1,4 +1,3 @@
-local Event = require 'utils.event'
 local Global = require 'utils.global'
 local RS = require 'map_gen.shared.redmew_surface'
 local b = require 'map_gen.shared.builders'
@@ -27,14 +26,14 @@ local extra_connection_attempts = 40
 local tile_scale = 14
 -- The ore probabilities
 -- Change weight to edit how likely ores are to spawn at every dead end
-value = b.exponential_value
+local exp_value = b.exponential_value
 local ores = {
-    {letter = 'i', resource = 'iron-ore', value = value(300, 0.75 * 5, 1.1), weight = 16},
-    {letter = 'c', resource = 'copper-ore', value = value(200, 0.75 * 5, 1.1), weight = 10},
-    {letter = 's', resource = 'stone', value = value(150, 0.3 * 5, 1.05), weight = 8},
-    {letter = 'f', resource = 'coal', value = value(200, 0.8 * 5, 1.075), weight = 8},
-    {letter = 'u', resource = 'uranium-ore', value = value(100, 0.3 * 5, 1.025), weight = 3},
-    {letter = 'o', resource = 'crude-oil', value = value(10000, 50 * 5, 1.025), weight = 4},
+    {letter = 'i', resource = 'iron-ore', value = exp_value(300, 0.75 * 5, 1.1), weight = 16},
+    {letter = 'c', resource = 'copper-ore', value = exp_value(200, 0.75 * 5, 1.1), weight = 10},
+    {letter = 's', resource = 'stone', value = exp_value(150, 0.3 * 5, 1.05), weight = 8},
+    {letter = 'f', resource = 'coal', value = exp_value(200, 0.8 * 5, 1.075), weight = 8},
+    {letter = 'u', resource = 'uranium-ore', value = exp_value(100, 0.3 * 5, 1.025), weight = 3},
+    {letter = 'o', resource = 'crude-oil', value = exp_value(10000, 50 * 5, 1.025), weight = 4},
     {letter = ' ', weight = 0} -- No ore
 }
 
@@ -82,8 +81,8 @@ local function initialize_grid(w, h)
 end
 
 -- average of a and b
-local function avg(a, b)
-    return (a + b) / 2
+local function avg(num_a, num_b)
+    return (num_a + num_b) / 2
 end
 
 local dirs = {
@@ -95,9 +94,6 @@ local dirs = {
 
 -- Adds perfect mazes in the remaining space of the map, each new number gets a unique region index
 local function fill_with_mazes(map)
-    local h = #map
-    local w = #map[1]
-
     local walk
     walk = function(x, y)
         map[y][x] = region_index
@@ -123,39 +119,6 @@ local function fill_with_mazes(map)
     end
 end
 
-local function print_map(map)
-    local s = ''
-    for i = 1, #map[1] + 2 do
-        s = s .. '+'
-    end
-    print(s)
-    s = ''
-    for y = 1, #map do
-        s = s .. '+'
-        for x = 1, #(map[y]) do
-            if map[y][x] == true then
-                s = s .. ' '
-            elseif map[y][x] == false then
-                --s = s .. '■'
-                s = s .. 'X'
-            elseif not tonumber(map[y][x]) then
-                --s = s .. ' '
-                s = s .. map[y][x]
-            else
-                --s = s .. map[y][x]
-                s = s .. ' '
-            end
-        end
-        s = s .. '+'
-        print(s)
-        s = ''
-    end
-    for i = 1, #map[1] + 2 do
-        s = s .. '+'
-    end
-    print(s)
-end
-
 -- Places a room if it fits in the map, each tile in the room will get a unique number from the region index
 local function try_place_room(map, top_left_x, top_left_y, room_size)
     for y = top_left_y, top_left_y + room_size - 1 do
@@ -177,9 +140,9 @@ local function try_place_room(map, top_left_x, top_left_y, room_size)
 end
 
 -- Attempts to place num_room_attemts number of rooms at random sizes, rooms are always placed at odd cordinates
-local function add_rooms(map, num_room_attempts, min_room_size, max_room_size)
+local function add_rooms(map, num_room_attempts, min_room_size, max_room_size) -- luacheck: ignore 431
     -- room_size must be odd
-    for attempt = 1, num_room_attempts do
+    for _ = 1, num_room_attempts do
         -- Generates a random odd number between min_room_size and max_room_size (inclusive both)
         local room_size = min_room_size + random(0, (max_room_size - min_room_size) / 2) * 2
         -- Generates a random odd top_left corner cordinate which would fit the room within the map
@@ -218,7 +181,7 @@ local function add_spawn_room(map)
 end
 
 -- Connects all different regions by making random walls between different regions into ground
-local function connect_regions(map, extra_connection_attempts)
+local function connect_regions(map, extra_connection_attempts) -- luacheck: ignore 431
     -- Returns false if the pos is not a connector (wall with 2 different regions next to it)
     -- Returns a table with the two neigbours if it is a connector
     local function check_connector(x, y)
@@ -286,7 +249,6 @@ local function connect_regions(map, extra_connection_attempts)
         local possible_connectors = {}
         for _, connector in ipairs(connectors) do
             local neighbours = connector.neighbours
-            local pos = connector.pos
             if is_connected(neighbours[1]) and not is_connected(neighbours[2]) then
                 possible_connectors[#possible_connectors + 1] = connector
             end
@@ -333,21 +295,6 @@ end
 
 -- Goes through the map and finds dead ends (tiles with 3 walls around them) and fills them in
 -- does this recursivly until every tile has at least 2 ground neighbours
-local function remove_all_dead_ends(map)
-    local function fill_dead_end(x, y)
-        local neighbours_with_ground = get_neighbours_with_ground(map, x, y)
-        if #neighbours_with_ground == 1 then
-            map[y][x] = false
-            local neighbour = neighbours_with_ground[1]
-            fill_dead_end(neighbour.x, neighbour.y)
-        end
-    end
-    for y = 1, #map do
-        for x = 1, #map[y] do
-            fill_dead_end(x, y)
-        end
-    end
-end
 
 local function add_ores_at_dead_ends(map)
     for y = 1, #map do
@@ -377,7 +324,6 @@ local function create_map()
     map[1][maze_width] = true
     map[maze_height][1] = true
     add_ores_at_dead_ends(map)
-    --remove_all_dead_ends(map)
 end
 
 -- Takes a filter_function(tile)->boolean
@@ -397,6 +343,38 @@ end
 
 --[[
     Uncomment below to run this file separatly and print result
+local function print_map(map)
+    local s = ''
+    for i = 1, #map[1] + 2 do
+        s = s .. '+'
+    end
+    print(s)
+    s = ''
+    for y = 1, #map do
+        s = s .. '+'
+        for x = 1, #(map[y]) do
+            if map[y][x] == true then
+                s = s .. ' '
+            elseif map[y][x] == false then
+                --s = s .. '■'
+                s = s .. 'X'
+            elseif not tonumber(map[y][x]) then
+                --s = s .. ' '
+                s = s .. map[y][x]
+            else
+                --s = s .. map[y][x]
+                s = s .. ' '
+            end
+        end
+        s = s .. '+'
+        print(s)
+        s = ''
+    end
+    for i = 1, #map[1] + 2 do
+        s = s .. '+'
+    end
+    print(s)
+end
 random = math.random
 create_map()
 print_map(map)
@@ -481,7 +459,7 @@ local start_coal_patch =
 )
 
 local start_resources = b.any({start_iron_patch, start_copper_patch, start_stone_patch, start_coal_patch})
-local factorio_map = b.apply_entity(factorio_map, start_resources)
+factorio_map = b.apply_entity(factorio_map, start_resources)
 
 -- Scale the map using the tile_scale variable
 factorio_map = b.scale(factorio_map, tile_scale, tile_scale)