![[Jenkins]](/pharo-ci-jenkins2/static/c16e5eee/images/svgs/logo.svg){kind=logo}
Branch indexing 20:04:36 Connecting to https://api.github.com using pharo-ci/****** (pharo-ci GitHub account) Connecting to https://api.github.com to check permissions of obtain list of guillep for pharo-project/threadedFFI-Plugin Checking out git https://github.com/pharo-project/threadedFFI-Plugin.git into /net/www/ci/pharo-ci-jenkins2/workspace/threadedFFI-plugin_PR-8@script to read Jenkinsfile > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/pharo-project/threadedFFI-Plugin.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/pharo-project/threadedFFI-Plugin.git > git --version # timeout=10 using GIT_ASKPASS to set credentials pharo-ci GitHub account > git fetch --no-tags --progress https://github.com/pharo-project/threadedFFI-Plugin.git +refs/pull/8/head:refs/remotes/origin/PR-8 +refs/heads/master:refs/remotes/origin/master Merging remotes/origin/master commit 977682838ce94ec7fbcade6e3ae41d01e3507e73 into PR head commit 87599970f1d6f1ca4265b58af5839da06936a175 > git config core.sparsecheckout # timeout=10 > git checkout -f 87599970f1d6f1ca4265b58af5839da06936a175 > git merge 977682838ce94ec7fbcade6e3ae41d01e3507e73 # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f 87599970f1d6f1ca4265b58af5839da06936a175 GitHub has been notified of this commit’s build result hudson.plugins.git.GitException: Command "git merge 977682838ce94ec7fbcade6e3ae41d01e3507e73" returned status code 1: stdout: Removing src/UnifiedFFI/package.st Removing src/UnifiedFFI/WindowsDynamicLoader.class.st Removing src/UnifiedFFI/WinPlatform.extension.st Removing src/UnifiedFFI/UnixPlatform.extension.st Removing src/UnifiedFFI/UnixDynamicLoader.class.st Removing src/UnifiedFFI/Unix64Platform.extension.st Removing src/UnifiedFFI/Unix32Platform.extension.st Removing src/UnifiedFFI/UndefinedObject.extension.st Removing src/UnifiedFFI/String.extension.st Removing src/UnifiedFFI/SmalltalkImage.extension.st Removing src/UnifiedFFI/SmallInteger.extension.st Removing src/UnifiedFFI/Object.extension.st Removing src/UnifiedFFI/OSPlatform.extension.st Removing src/UnifiedFFI/MacOSPlatform.extension.st CONFLICT (modify/delete): src/UnifiedFFI/LibC.class.st deleted in 977682838ce94ec7fbcade6e3ae41d01e3507e73 and modified in HEAD. Version HEAD of src/UnifiedFFI/LibC.class.st left in tree. Removing src/UnifiedFFI/Integer.extension.st Removing src/UnifiedFFI/Float.extension.st Removing src/UnifiedFFI/FFIi386CallbackArgumentReader.class.st Removing src/UnifiedFFI/FFI_x86_64_Windows.class.st Removing src/UnifiedFFI/FFI_x86_64_SystemV.class.st Removing src/UnifiedFFI/FFI_x86_64.class.st Removing src/UnifiedFFI/FFI_i386.class.st Removing src/UnifiedFFI/FFIWin64CallbackArgumentReader.class.st Removing src/UnifiedFFI/FFIVoid.class.st Removing src/UnifiedFFI/FFIVariableNameNotFound.class.st Removing src/UnifiedFFI/FFIValueArgument.class.st Removing src/UnifiedFFI/FFIUnknownLibrary.class.st Removing src/UnifiedFFI/FFIULong.class.st Removing src/UnifiedFFI/FFIUInt8.class.st Removing src/UnifiedFFI/FFIUInt64.class.st Removing src/UnifiedFFI/FFIUInt32.class.st Removing src/UnifiedFFI/FFIUInt16.class.st Removing src/UnifiedFFI/FFIUBit.class.st Removing src/UnifiedFFI/FFITypeArrayType.class.st Removing src/UnifiedFFI/FFITypeArray.class.st Removing src/UnifiedFFI/FFISystemV64CallbackArgumentReader.class.st Removing src/UnifiedFFI/FFISizeT.class.st Removing src/UnifiedFFI/FFISelfArgument.class.st Removing src/UnifiedFFI/FFIOpaqueObjectType.class.st Removing src/UnifiedFFI/FFIOpaqueObject.class.st Removing src/UnifiedFFI/FFIOop.class.st Removing src/UnifiedFFI/FFIMethodRegistry.class.st Removing src/UnifiedFFI/FFIMethodArgument.class.st Removing src/UnifiedFFI/FFILong.class.st CONFLICT (modify/delete): src/UnifiedFFI/FFILibrary.class.st deleted in 977682838ce94ec7fbcade6e3ae41d01e3507e73 and modified in HEAD. Version HEAD of src/UnifiedFFI/FFILibrary.class.st left in tree. Removing src/UnifiedFFI/FFIIntegerType.class.st Removing src/UnifiedFFI/FFIInt8.class.st Removing src/UnifiedFFI/FFIInt64.class.st Removing src/UnifiedFFI/FFIInt32.class.st Removing src/UnifiedFFI/FFIInt16.class.st Removing src/UnifiedFFI/FFIInstVarArgument.class.st Removing src/UnifiedFFI/FFIIndirectFunctionResolution.class.st Removing src/UnifiedFFI/FFIFunctionSpec.class.st Removing src/UnifiedFFI/FFIFunctionResolutionStrategy.class.st Removing src/UnifiedFFI/FFIFunctionParser.class.st Removing src/UnifiedFFI/FFIFunctionArgument.class.st Removing src/UnifiedFFI/FFIFloatType.class.st Removing src/UnifiedFFI/FFIFloat64.class.st Removing src/UnifiedFFI/FFIFloat32.class.st Removing src/UnifiedFFI/FFIFloat16.class.st Removing src/UnifiedFFI/FFIFloat128.class.st Removing src/UnifiedFFI/FFIExternalValueHolderType.class.st Removing src/UnifiedFFI/FFIExternalValueHolder.class.st Removing src/UnifiedFFI/FFIExternalUnion.class.st Removing src/UnifiedFFI/FFIExternalType.class.st Removing src/UnifiedFFI/FFIExternalStructureType.class.st Removing src/UnifiedFFI/FFIExternalStructureReferenceHandle.class.st Removing src/UnifiedFFI/FFIExternalStructureFlatLayoutField.class.st Removing src/UnifiedFFI/FFIExternalStructureFlatLayout.class.st Removing src/UnifiedFFI/FFIExternalStructureFieldSpec.class.st Removing src/UnifiedFFI/FFIExternalStructureFieldParser.class.st CONFLICT (modify/delete): src/UnifiedFFI/FFIExternalStructure.class.st deleted in 977682838ce94ec7fbcade6e3ae41d01e3507e73 and modified in HEAD. Version HEAD of src/UnifiedFFI/FFIExternalStructure.class.st left in tree. Removing src/UnifiedFFI/FFIExternalString.class.st Removing src/UnifiedFFI/FFIExternalResourceManager.class.st Removing src/UnifiedFFI/FFIExternalResourceExecutor.class.st Removing src/UnifiedFFI/FFIExternalReferenceType.class.st Removing src/UnifiedFFI/FFIExternalReference.class.st Removing src/UnifiedFFI/FFIExternalPackedStructure.class.st Removing src/UnifiedFFI/FFIExternalObjectType.class.st Removing src/UnifiedFFI/FFIExternalObject.class.st Removing src/UnifiedFFI/FFIExternalEnumerationType.class.st Removing src/UnifiedFFI/FFIExternalEnumeration.class.st Removing src/UnifiedFFI/FFIExternalArrayType.class.st Removing src/UnifiedFFI/FFIExternalArray.class.st Removing src/UnifiedFFI/FFIDereferencedOpaqueObjectError.class.st Removing src/UnifiedFFI/FFIConstantHandleType.class.st Removing src/UnifiedFFI/FFIConstantHandle.class.st Removing src/UnifiedFFI/FFIConst.class.st CONFLICT (modify/delete): src/UnifiedFFI/FFICompilerPlugin.class.st deleted in 977682838ce94ec7fbcade6e3ae41d01e3507e73 and modified in HEAD. Version HEAD of src/UnifiedFFI/FFICompilerPlugin.class.st left in tree. Removing src/UnifiedFFI/FFICharacterType.class.st Removing src/UnifiedFFI/FFICalloutMethodBuilder.class.st Removing src/UnifiedFFI/FFICalloutAPI.class.st Removing src/UnifiedFFI/FFICallout.class.st Removing src/UnifiedFFI/FFICallbackType.class.st Removing src/UnifiedFFI/FFICallbackFunctionResolution.class.st CONFLICT (modify/delete): src/UnifiedFFI/FFICallbackArgumentReader.class.st deleted in 977682838ce94ec7fbcade6e3ae41d01e3507e73 and modified in HEAD. Version HEAD of src/UnifiedFFI/FFICallbackArgumentReader.class.st left in tree. Removing src/UnifiedFFI/FFICallback.class.st Removing src/UnifiedFFI/FFIBool.class.st Removing src/UnifiedFFI/FFIBit.class.st Removing src/UnifiedFFI/FFIArchitecture.class.st Removing src/UnifiedFFI/FFIAlienCallback.class.st Removing src/UnifiedFFI/FFIAbstract64BitsArgumentReader.class.st Removing src/UnifiedFFI/ExternalType.extension.st Removing src/UnifiedFFI/ExternalObject.extension.st Removing src/UnifiedFFI/ExternalData.extension.st Removing src/UnifiedFFI/ExternalAddress.extension.st Removing src/UnifiedFFI/DynamicLoader.class.st Removing src/UnifiedFFI/Context.extension.st Removing src/UnifiedFFI/CompiledMethod.extension.st Removing src/UnifiedFFI/Callback.extension.st Removing src/UnifiedFFI/ByteArray.extension.st Removing src/UnifiedFFI/Boolean.extension.st Removing src/UnifiedFFI/BlockClosure.extension.st Removing src/UnifiedFFI/Behavior.extension.st Removing src/UnifiedFFI/Alien.extension.st Removing src/UnifiedFFI-Tests/package.st Removing src/UnifiedFFI-Tests/ManifestUnifiedFFITests.class.st Removing src/UnifiedFFI-Tests/FFITypesTest.class.st Removing src/UnifiedFFI-Tests/FFITypeArrayTest.class.st Removing src/UnifiedFFI-Tests/FFITestUnion.class.st Removing src/UnifiedFFI-Tests/FFITestStructureSmallIntFloatStructure.class.st Removing src/UnifiedFFI-Tests/FFITestStructureSmallFloatStructure.class.st Removing src/UnifiedFFI-Tests/FFITestStructureIntStructure.class.st Removing src/UnifiedFFI-Tests/FFITestStructureDoubleStructure.class.st Removing src/UnifiedFFI-Tests/FFITestStructureByPlatform.class.st Removing src/UnifiedFFI-Tests/FFITestStructure4Int64Structure.class.st Removing src/UnifiedFFI-Tests/FFITestStructure2Int64Structure.class.st Removing src/UnifiedFFI-Tests/FFITestStructure2DoubleStructure.class.st Removing src/UnifiedFFI-Tests/FFITestStructure.class.st Removing src/UnifiedFFI-Tests/FFITestPointerStructure.class.st Removing src/UnifiedFFI-Tests/FFITestPackedStructure.class.st Removing src/UnifiedFFI-Tests/FFITestNestingStructureWithArray.class.st Removing src/UnifiedFFI-Tests/FFITestNestingStructure.class.st Removing src/UnifiedFFI-Tests/FFITestEnumeration.class.st Removing src/UnifiedFFI-Tests/FFITestArrayStructure.class.st Removing src/UnifiedFFI-Tests/FFIOpaqueObjectTest.class.st Removing src/UnifiedFFI-Tests/FFIFunctionParserTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalValueHolderTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalUnionTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalStructureTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalStructurePlatformTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalStructureFieldParserTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalPackedStructureTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalEnumerationTest.class.st Removing src/UnifiedFFI-Tests/FFIExternalArrayTest.class.st Removing src/UnifiedFFI-Tests/FFIConstantHandleTest.class.st Removing src/UnifiedFFI-Tests/FFICompilerPluginTest.class.st Removing src/UnifiedFFI-Tests/FFICalloutTest.class.st Removing src/UnifiedFFI-Tests/FFICalloutObjectForTest.class.st Removing src/UnifiedFFI-Tests/FFICalloutMethodBuilderTestRecuestor.class.st Removing src/UnifiedFFI-Tests/FFICalloutMethodBuilderTestContext.class.st Removing src/UnifiedFFI-Tests/FFICalloutMethodBuilderTest.class.st CONFLICT (modify/delete): src/UnifiedFFI-Tests/FFICalloutAPITest.class.st deleted in 977682838ce94ec7fbcade6e3ae41d01e3507e73 and modified in HEAD. Version HEAD of src/UnifiedFFI-Tests/FFICalloutAPITest.class.st left in tree. Removing src/UnifiedFFI-Tests/FFICallbackTest.class.st Removing src/UnifiedFFI-Tests/FFICallbackParametersTest.class.st Removing src/UnifiedFFI-Tests/FFIArchitectureTest.class.st Auto-merging src/ThreadedFFI/TFSameThreadRunner.class.st CONFLICT (content): Merge conflict in src/ThreadedFFI/TFSameThreadRunner.class.st Auto-merging src/ThreadedFFI/TFRunner.class.st CONFLICT (content): Merge conflict in src/ThreadedFFI/TFRunner.class.st Auto-merging src/ThreadedFFI/TFCallbackInvocation.class.st Auto-merging src/ThreadedFFI/TFCallback.class.st Auto-merging src/ThreadedFFI-UFFI/TFCalloutMethodBuilder.class.st CONFLICT (content): Merge conflict in src/ThreadedFFI-UFFI/TFCalloutMethodBuilder.class.st Auto-merging src/ThreadedFFI-UFFI-Tests/TFTestLibraryUsingSameThreadRunner.class.st Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2016) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1984) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1980) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1612) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:712) at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:122) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1094) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1187) at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:120) at org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create(CpsScmFlowDefinition.java:144) at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:120) at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:303) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Finished: FAILURE