Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: A basic implementation for an npc #201

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from

Add npcs

c871587
Select commit
Loading
Failed to load commit list.
Draft

feat: A basic implementation for an npc #201

Add npcs
c871587
Select commit
Loading
Failed to load commit list.
Terasology Jenkins.io / Jenkins failed Dec 16, 2024 in 7s

Declarative: Checkout SCM: error in 'checkout' step

Declarative: Checkout SCM / Check out from version control

Error in checkout step.

hudson.plugins.git.GitException: Command "git merge 0a0a80085255e5caa00c5b34d09982742d160309" returned status code 1:
stdout: CONFLICT (file location): src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/EnemiesUpdateSystem.java added in HEAD inside a directory that was renamed in 0a0a80085255e5caa00c5b34d09982742d160309, suggesting it should perhaps be moved to src/main/java/org/terasology/module/lightandshadow/systems/EnemiesUpdateSystem.java.
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Build log
The recommended git tool is: NONE
using credential gh-app-terasology
Cloning the remote Git repository
Cloning with configured refspecs honoured and without tags
Cloning repository https://github.com/Terasology/LightAndShadow.git
 > git init /home/jenkins/agent/workspace/_Modules_L_LightAndShadow_PR-201 # timeout=10
Fetching upstream changes from https://github.com/Terasology/LightAndShadow.git
 > git --version # timeout=10
 > git --version # 'git version 2.39.2'
using GIT_ASKPASS to set credentials GitHub App auth for Terasology org
 > git fetch --no-tags --force --progress -- https://github.com/Terasology/LightAndShadow.git +refs/pull/201/head:refs/remotes/origin/PR-201 +refs/heads/develop:refs/remotes/origin/develop # timeout=10
Fetching without tags
Merging remotes/origin/develop commit 0a0a80085255e5caa00c5b34d09982742d160309 into PR head commit c87158760fe73a31cbdd2b150ff54e6b8cc3062e
ERROR: Checkout failed
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to kaniko-precached-jdk17-lg9nt
		at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1923)
		at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:384)
		at hudson.remoting.Channel.call(Channel.java:1112)
		at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.execute(RemoteGitImpl.java:153)
		at jdk.internal.reflect.GeneratedMethodAccessor1529.invoke(Unknown Source)
		at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
		at java.base/java.lang.reflect.Method.invoke(Unknown Source)
		at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.invoke(RemoteGitImpl.java:138)
		at PluginClassLoader for git-client/jdk.proxy99/jdk.proxy99.$Proxy219.execute(Unknown Source)
		at PluginClassLoader for git//jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:120)
		at PluginClassLoader for git//hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1160)
		at PluginClassLoader for git//hudson.plugins.git.GitSCM._checkout(GitSCM.java:1311)
		at PluginClassLoader for git//hudson.plugins.git.GitSCM.checkout(GitSCM.java:1277)
		at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:136)
		at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:101)
		at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:88)
		at PluginClassLoader for workflow-step-api//org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47)
		at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
		at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
		at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
		at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
		at java.base/java.lang.Thread.run(Unknown Source)
hudson.plugins.git.GitException: Command "git merge 0a0a80085255e5caa00c5b34d09982742d160309" returned status code 1:
stdout: CONFLICT (file location): src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/EnemiesUpdateSystem.java added in HEAD inside a directory that was renamed in 0a0a80085255e5caa00c5b34d09982742d160309, suggesting it should perhaps be moved to src/main/java/org/terasology/module/lightandshadow/systems/EnemiesUpdateSystem.java.
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2848)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2184)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2080)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2071)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:990)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:170)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:161)
	at hudson.remoting.UserRequest.perform(UserRequest.java:225)
	at hudson.remoting.UserRequest.perform(UserRequest.java:50)
	at hudson.remoting.Request$2.run(Request.java:391)
	at hudson.remoting.InterceptingExecutorService.lambda$wrap$0(InterceptingExecutorService.java:81)
	at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
	at hudson.remoting.Engine$1.lambda$newThread$0(Engine.java:140)
	at java.base/java.lang.Thread.run(Unknown Source)
Caused: java.io.IOException
	at PluginClassLoader for git//hudson.plugins.git.GitSCM.checkout(GitSCM.java:1279)
	at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:136)
	at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:101)
	at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:88)
	at PluginClassLoader for workflow-step-api//org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47)
	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
	at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
	at java.base/java.lang.Thread.run(Unknown Source)
ERROR: Maximum checkout retry attempts reached, aborting

Details

  • Declarative: Checkout SCM (6 sec)
    Error: *hudson.plugins.git.GitException: Command "git merge 0a0a800" returned status code 1:
    stdout: CONFLICT (file location): src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/EnemiesUpdateSystem.java added in HEAD inside a directory that was renamed in 0a0a800, suggesting it should perhaps be moved to src/main/java/org/terasology/module/lightandshadow/systems/EnemiesUpdateSystem.java.
    Automatic merge failed; fix conflicts and then commit the result.

stderr: *