mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-29 02:15:43 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0633cc911 | ||
|
|
d1e4ba4efe |
@@ -268,12 +268,21 @@ jobs:
|
||||
# Use exact image tags passed from build jobs (no :latest fallback)
|
||||
echo "Using images: $EAGLE_IMAGE, $SHARDOK_IMAGE"
|
||||
|
||||
# Pull images with exact SHA tags
|
||||
# Clear Docker's content store cache to avoid digest mismatch errors
|
||||
# docker image rm isn't enough - need to clear buildkit and containerd cache
|
||||
echo "Clearing Docker cache to avoid digest conflicts..."
|
||||
docker builder prune -a -f 2>/dev/null || true
|
||||
docker image rm "$EAGLE_IMAGE" "$SHARDOK_IMAGE" 2>/dev/null || true
|
||||
# Nuclear option: clear all unused images/cache if digest issues persist
|
||||
docker system prune -f 2>/dev/null || true
|
||||
|
||||
# Pull fresh images with exact SHA tags
|
||||
# Use --platform to be explicit about architecture
|
||||
echo "Pulling Eagle image: $EAGLE_IMAGE"
|
||||
docker pull "${EAGLE_IMAGE}" || { echo "ERROR: Failed to pull eagle image"; exit 1; }
|
||||
docker pull --platform linux/amd64 "${EAGLE_IMAGE}" || { echo "ERROR: Failed to pull eagle image"; exit 1; }
|
||||
|
||||
echo "Pulling Shardok image: $SHARDOK_IMAGE"
|
||||
docker pull "${SHARDOK_IMAGE}" || { echo "ERROR: Failed to pull shardok image"; exit 1; }
|
||||
docker pull --platform linux/amd64 "${SHARDOK_IMAGE}" || { echo "ERROR: Failed to pull shardok image"; exit 1; }
|
||||
|
||||
# Also pull other compose images
|
||||
docker pull nginx:alpine || true
|
||||
|
||||
@@ -1,18 +1,5 @@
|
||||
load("@rules_scala//scala:scala.bzl", "scala_library")
|
||||
|
||||
scala_library(
|
||||
name = "action_pkg",
|
||||
srcs = ["package.scala"],
|
||||
visibility = [
|
||||
"//src/main/scala/net/eagle0/eagle/library:__subpackages__",
|
||||
"//src/test/scala/net/eagle0/eagle/library:__subpackages__",
|
||||
],
|
||||
runtime_deps = [
|
||||
"@maven//:com_thesamet_scalapb_lenses_3",
|
||||
],
|
||||
deps = ["//src/main/protobuf/net/eagle0/eagle/internal:action_result_scala_proto"],
|
||||
)
|
||||
|
||||
scala_library(
|
||||
name = "check_for_faction_changes_action",
|
||||
srcs = ["CheckForFactionChangesAction.scala"],
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package net.eagle0.eagle.library.actions.impl
|
||||
|
||||
import net.eagle0.eagle.internal.action_result.ActionResult
|
||||
import scalapb.lenses
|
||||
import scalapb.lenses.Lens
|
||||
|
||||
package object action {
|
||||
type ActionResultProtoUpdater =
|
||||
Lens[ActionResult, ActionResult] => lenses.Mutation[ActionResult]
|
||||
}
|
||||
@@ -9,12 +9,10 @@ scala_library(
|
||||
exports = [
|
||||
"//src/main/protobuf/net/eagle0/eagle/internal:action_result_scala_proto",
|
||||
"//src/main/scala/net/eagle0/common:functional_random",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/action:action_pkg",
|
||||
],
|
||||
deps = [
|
||||
"//src/main/scala/net/eagle0/common:functional_random",
|
||||
"//src/main/scala/net/eagle0/eagle:eagle_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/action:action_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library/settings:max_desired_truce_count_for_quest",
|
||||
"//src/main/scala/net/eagle0/eagle/library/settings:min_desired_new_truce_count_for_quest",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/faction",
|
||||
@@ -33,13 +31,11 @@ scala_library(
|
||||
exports = [
|
||||
"//src/main/protobuf/net/eagle0/eagle/internal:action_result_scala_proto",
|
||||
"//src/main/scala/net/eagle0/common:functional_random",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/action:action_pkg",
|
||||
],
|
||||
deps = [
|
||||
":truce_count_quest_creation",
|
||||
"//src/main/scala/net/eagle0/common:functional_random",
|
||||
"//src/main/scala/net/eagle0/eagle:eagle_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/action:action_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library/settings:alms_province_count_exponent",
|
||||
"//src/main/scala/net/eagle0/eagle/library/settings:gift_province_count_exponent",
|
||||
"//src/main/scala/net/eagle0/eagle/library/settings:max_desired_alms_to_province_given",
|
||||
|
||||
Reference in New Issue
Block a user