Merge branch 'master' into issue-2455

Author: ttuegel

.editorconfig

@@ -11,3 +11,7 @@ indent_size = 4
 [*.nix]
 indent_style = space
 indent_size = 2
+
+[Jenkinsfile*]
+indent_style = space
+indent_size = 2

Dockerfile

@@ -5,25 +5,36 @@ ENV TZ=America/Chicago
 RUN    ln --symbolic --no-dereference --force /usr/share/zoneinfo/$TZ /etc/localtime \
     && echo $TZ > /etc/timezone
 
-RUN    apt update                                                                \
-    && apt upgrade --yes                                                         \
-    && apt install --yes                                                         \
-           libtinfo-dev                                                          \
+RUN    apt update              \
+    && apt upgrade --yes       \
+    && apt install --yes       \
+           libtinfo-dev        \
            curl git make unzip
 
+ARG STACK=2.5.1
+RUN curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v$STACK/etc/scripts/get-stack.sh | sh
+
+ARG HUB=2.14.2
+RUN    curl -sSL https://github.com/github/hub/releases/download/v$HUB/hub-linux-amd64-$HUB.tgz | tar -xz \
+    && ( cd hub-linux-amd64-$HUB && ./install prefix=/usr/local ) \
+    && rm -fr hub-linux-amd64-$HUB
+
 ENV LC_ALL=C.UTF-8
+ADD ./src/main/kore/prelude.kore /usr/include/kframework/kore/prelude.kore
 
 ARG USER_ID=1000
 ARG GROUP_ID=1000
 RUN    groupadd --gid $GROUP_ID user                                        \
     && useradd --create-home --uid $USER_ID --shell /bin/sh --gid user user
 
-ARG STACK=2.5.1
-RUN curl -sSL https://raw.githubusercontent.com/commercialhaskell/stack/v$STACK/etc/scripts/get-stack.sh | sh
-
 USER $USER_ID:$GROUP_ID
 WORKDIR /home/user
 
 ADD --chown=user:user stack.yaml .tmp-haskell/
-ADD --chown=user:user kore/package.yaml .tmp-haskell/kore/
-RUN cd .tmp-haskell && stack build --only-snapshot --test --bench --haddock
+ADD --chown=user:user kore/kore.cabal .tmp-haskell/kore/
+RUN    ( cd .tmp-haskell && stack build --only-snapshot --test --bench --haddock ) \
+    && rm -fr .tmp-haskell
+
+ADD --chown=user:user docker/ssh/config .ssh/
+RUN    git config --global user.email "[email protected]" \
+    && git config --global user.name  "RV Jenkins"

Jenkinsfile

@@ -5,79 +5,115 @@ pipeline {
       additionalBuildArgs '--build-arg K_COMMIT=$(cat deps/k_release | cut --characters=2-) --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g)'
     }
   }
+  parameters {
+    choice(name: 'STAGE',
+      choices: [
+        'TEST',
+        'UPDATE-TESTS'
+      ],
+      description: '''
+        TEST: Run tests, as on push and change request events.
+        UPDATE-TESTS: Update some generated tests, such as the regression tests.
+      '''
+    )
+  }
   options {
     ansiColor('xterm')
   }
+  triggers {
+    parameterizedCron('''
+      H H * * 0 % STAGE=UPDATE-TESTS
+    ''')
+  }
   environment {
     LONG_REV = """${sh(returnStdout: true, script: 'git rev-parse HEAD').trim()}"""
   }
   stages {
-    stage('Init title') {
-      when { changeRequest() }
-      steps {
-        script {
-          currentBuild.displayName = "PR ${env.CHANGE_ID}: ${env.CHANGE_TITLE}"
-        }
+    stage('Update regression tests') {
+      when { expression { return params.STAGE == 'UPDATE-TESTS' } }
+      environment {
+        GITHUB_TOKEN = credentials('rv-jenkins')
       }
-    }
-    stage('Dependencies') {
       steps {
-        sh '''
-          ./scripts/clean.sh
-          ./scripts/deps.sh
-        '''
+        sshagent(['2b3d8d6b-0855-4b59-864a-6b3ddf9c9d1a']) {
+          sh '''
+            git remote set-url origin [email protected]:kframework/kore
+            ./scripts/update-tests.sh
+          '''
+        }
       }
     }
-    stage('Stages') {
-      failFast true
-      parallel {
-        stage('Documentation') {
+    stage('Test') {
+      when { expression { return params.STAGE == 'TEST' } }
+      stages {
+        stage('Init title') {
+          when { changeRequest() }
           steps {
-            sh '''
-              ./scripts/docs.sh
-            '''
+            script {
+              currentBuild.displayName = "PR ${env.CHANGE_ID}: ${env.CHANGE_TITLE}"
+            }
           }
         }
-        stage('Unit Tests') {
-          options {
-            timeout(time: 24, unit: 'MINUTES')
-          }
+        stage('Dependencies') {
           steps {
             sh '''
-              ./scripts/unit-test.sh
+              ./scripts/clean.sh
+              ./scripts/deps.sh
             '''
           }
-          post {
-            always {
-              junit 'kore/test-results.xml'
+        }
+        stage('Stages') {
+          failFast true
+          parallel {
+            stage('Documentation') {
+              steps {
+                sh '''
+                  ./scripts/docs.sh
+                '''
+              }
+            }
+            stage('Unit Tests') {
+              options {
+                timeout(time: 24, unit: 'MINUTES')
+              }
+              steps {
+                sh '''
+                  ./scripts/unit-test.sh
+                '''
+              }
+              post {
+                always {
+                  junit 'kore/test-results.xml'
+                }
+              }
+            }
+            stage('Integration Tests') {
+              environment {
+                JOBS = 2
+              }
+              options {
+                timeout(time: 48, unit: 'MINUTES')
+              }
+              steps {
+                sh '''
+                  ./scripts/integration-k.sh
+                '''
+              }
             }
           }
         }
-        stage('Integration Tests') {
-          environment {
-            JOBS = 2
-          }
-          options {
-            timeout(time: 48, unit: 'MINUTES')
-          }
+        stage('Update K Submodules') {
+          when { branch 'master' }
           steps {
-            sh '''
-              ./scripts/integration-k.sh
-            '''
+            build job: 'rv-devops/master', propagate: false, wait: false                                \
+                , parameters: [ booleanParam ( name: 'UPDATE_DEPS'         , value: true              ) \
+                              , string       ( name: 'UPDATE_DEPS_REPO'    , value: 'kframework/kore' ) \
+                              , string       ( name: 'UPDATE_DEPS_VERSION' , value: "${env.LONG_REV}" ) \
+                              ]
           }
         }
       }
     }
-    stage('Update K Submodules') {
-      when { branch 'master' }
-      steps {
-        build job: 'rv-devops/master', propagate: false, wait: false                                \
-            , parameters: [ booleanParam ( name: 'UPDATE_DEPS'         , value: true              ) \
-                          , string       ( name: 'UPDATE_DEPS_REPO'    , value: 'kframework/kore' ) \
-                          , string       ( name: 'UPDATE_DEPS_VERSION' , value: "${env.LONG_REV}" ) \
-                          ]
-      }
-    }
   }
   post {
     unsuccessful {

default.nix

@@ -42,7 +42,6 @@ let
         "/*"
         "!/stack.yaml"
         "!/kore"
-        "*.cabal"
       ];
     };
     inherit checkMaterialization;
@@ -73,6 +72,7 @@ let
   shell = import ./shell.nix { inherit default checkMaterialization; };
 
   version = project.kore.components.exes.kore-exec.version;
+  # version = "0.43.0.0";
 
   prelude-kore = ./src/main/kore/prelude.kore;
 

deps/k_release

@@ -1 +1 @@
-v5.0.6
+v5.1.8

docker/ssh/config

@@ -0,0 +1,5 @@
+host github.com
+    hostname github.com
+    user git
+    identityagent SSH_AUTH_SOCK
+    stricthostkeychecking accept-new

kore/CHANGELOG.md

@@ -14,6 +14,13 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## [0.44.0.0] - 2021-04-22
+
+### Fixed
+
+- Concrete side conditions will be fully simplified. (#2526)
+- A memory leak is removed where deciding if a Map or Set is defined. (#2550)
+
 ## [0.43.0.0] - 2021-04-07
 
 ### Changed