Skip to content
GitLab
    • Explore Projects Groups Topics Snippets
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • R Rsic2
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 3
    • Issues 3
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 2
    • Merge requests 2
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

La forge institutionnelle d'INRAE étant en production depuis le 10 juin 2025, nous vous invitons à y créer vos nouveaux projets.

  • SIC2SIC2
  • Rsic2
  • Merge requests
  • !16
An error occurred while fetching the assigned milestone of the selected merge_request.

Draft: Resolve "Test SIC execution into a Wine environment"

  • Review changes

  • Download
  • Patches
  • Plain diff
Open Dorchies David requested to merge 5-test-sic-execution-into-a-wine-environment into main 1 year ago
  • Overview 0
  • Commits 2
  • Pipelines 3
  • Changes 6

Closes #5

Compare
  • version 1
    d0edc2d7
    1 year ago

  • main (base)

and
  • latest version
    0a019d70
    2 commits, 1 year ago

  • version 1
    d0edc2d7
    1 commit, 1 year ago

6 files
+ 78
− 5

    Preferences

    File browser
    Compare changes
.devcontainer/.gitignore 0 → 100644
+ 1
− 0
  • View file @ 0a019d70

  • Edit in single-file editor

  • Open in Web IDE

Sic*
.devcontainer/DockerFile 0 → 100644
+ 29
− 0
  • View file @ 0a019d70

  • Edit in single-file editor

  • Open in Web IDE

FROM rocker/geospatial:4.3.2
RUN apt-get update \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends \
gnupg \
&& rm -rf /var/lib/apt/lists/*
# Install wine
ARG WINE_BRANCH="stable"
RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
&& echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \
&& dpkg --add-architecture i386 \
&& apt-get update \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends \
winehq-${WINE_BRANCH} \
&& rm -rf /var/lib/apt/lists/*
# Install winetricks
RUN wget -nv -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
&& chmod +x /usr/bin/winetricks
ENV XVFB_RESOLUTION 320x240x8
ENV XVFB_SCREEN 0
ENV XVFB_SERVER :95
RUN nohup /usr/bin/Xvfb "${XVFB_SERVER}" -screen "${XVFB_SCREEN}" "${XVFB_RESOLUTION}" >/dev/null 2>&1 &
# Install SIC
COPY Sic542a1 /sic/
RUN mv sic/exe/extra/ithea.dll /sic/exe/.
.devcontainer/devcontainer.json 0 → 100644
+ 35
− 0
  • View file @ 0a019d70

  • Edit in single-file editor

  • Open in Web IDE

// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"name": "SIC²",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
//"image": "geaucassiopee/ci-cd-cross-platform-webapp:v3",
"build": { "dockerfile": "./Dockerfile" },
"customizations": {
"vscode": {
"extensions": [
"janisdd.vscode-edit-csv",
"eamodio.gitlens",
"streetsidesoftware.code-spell-checker",
"streetsidesoftware.code-spell-checker-french",
"REditorSupport.r"
]
}
},
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "R -q -e 'install.packages(c(\"languageserver\"));remotes::install_deps(dep = TRUE)'",
"postStartCommand": "R -q -e 'devtools::install(dependencies = TRUE)'"
// Configure tool-specific properties.
// "customizations": {},
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
R/sic_run_fortran.R
+ 11
− 5
  • View file @ 0a019d70

  • Edit in single-file editor

  • Open in Web IDE


@@ -86,11 +86,17 @@ sic_run_fortran <- function(cfg, prog, params) {
type = "cmd2"
)
logger::log_debug(cmd_line)
shell(
cmd_line,
wait = T,
translate = T
)
if (xfun::is_windows()) {
r <- shell(
cmd_line,
wait = T,
translate = T
)
} else {
r <- system(paste("wine", cmd_line))
}
attr(r, "cmd_line") <- cmd_line
return(r)
}
#' @noRd
.Rbuildignore
+ 1
− 0
  • View file @ 0a019d70

  • Edit in single-file editor

  • Open in Web IDE


Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.
@@ -6,3 +6,4 @@
[.]INI$
^\.gitlab-ci\.yml$
^ci$
^\.devcontainer$
Assignee
Dorchies David's avatar
Dorchies David
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 Participants
Reference:
Source branch: 5-test-sic-execution-into-a-wine-environment

Menu

Explore Projects Groups Topics Snippets