wip

nitlang · Jun 25, 2024 · 5e0faca · 5e0faca
1 parent 616056f
commit 5e0faca
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -7,10 +7,10 @@ env:
   # BASIC_PACKAGES is used fo the basic tools (make)
   BASIC_PACKAGES: git build-essential ccache libgc-dev graphviz libunwind-dev libreadline-dev pkg-config
   # MORE_PACKAGES is used for more tools and libs (make more)
-  MORE_PACKAGES: libgmp-dev libcurl4-openssl-dev libevent-dev openjdk-11-jdk-headless libgles-dev libegl-dev libsdl1.2-dev libsdl2-dev libsdl2-mixer-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-net-dev libsdl2-ttf-dev libgtk-3-dev inkscape postgresql libxdg-basedir-dev gettext libsqlite3-dev libpq-dev libmongoc-dev openmpi-bin libopenmpi-dev
-  JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/
-  JNI_LIB_PATH: /usr/lib/jvm/java-11-openjdk-amd64/lib/server/
-  LD_LIBRARY_PATH: /usr/lib/jvm/java-11-openjdk-amd64/lib/server/
+  MORE_PACKAGES: libgmp-dev libcurl4-openssl-dev libevent-dev openjdk-17-jdk-headless libgles-dev libegl-dev libsdl1.2-dev libsdl2-dev libsdl2-mixer-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-net-dev libsdl2-ttf-dev libgtk-3-dev inkscape postgresql libxdg-basedir-dev gettext libsqlite3-dev libpq-dev libmongoc-dev openmpi-bin libopenmpi-dev
+  JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64/
+  JNI_LIB_PATH: /usr/lib/jvm/java-17-openjdk-amd64/lib/server/
+  LD_LIBRARY_PATH: /usr/lib/jvm/java-17-openjdk-amd64/lib/server/
 
 jobs:
   build:
@@ -197,9 +197,9 @@ jobs:
           NEO4J_AUTH: none
     steps:
     - uses: actions/checkout@v4
-    - run: misc/jenkins/ensuregit.sh
     - name: Install dependencies
       run: apt-get update && apt-get install -y $BASIC_PACKAGES
+    - run: misc/jenkins/ensuregit.sh
     - uses: actions/download-artifact@v4
     - run: chmod +x bin/*
     - run: make nitunit-src
@@ -295,3 +295,14 @@ jobs:
     - run: cat /etc/issue
     - run: cat /etc/os-release
     - run: env
+
+  ensuregit:
+    runs-on: ubuntu-24.04
+    container: "ubuntu:24.04"
+    steps:
+    - run: env
+    - run: git branch -av || true
+    - run: apt-get update && apt-get install -y $BASIC_PACKAGES
+    - run: misc/jenkins/ensuregit.sh
+    - run: git branch -av || true
+    - run: git log --oneline --graph --decorate origin/master..HEAD
diff --git a/misc/jenkins/ensuregit.sh b/misc/jenkins/ensuregit.sh
@@ -6,7 +6,15 @@ if ! test -f src/nitc.nit; then
 	exit 1
 fi
 
-git init
-git remote add origin https://github.com/nitlang/nit.git
-git remote set-url origin https://github.com/nitlang/nit.git
-git fetch origin
+set -x
+if [ -d .git ]; then
+	git remote set-url origin https://github.com/nitlang/nit.git
+	git fetch origin
+	git branch -av
+else
+	git init
+	git remote add origin https://github.com/nitlang/nit.git
+	git fetch origin
+	git reset "$GITHUB_SHA"
+	git branch -av
+fi