Merge pull request #27 from ortus-boxlang/development

reseed to download new scripts
ortus-boxlang · Jan 13, 2025 · c279062 · c279062
2 parents ff29afb + b755012
commit c279062
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 74 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -1,15 +1,18 @@
 name: Pull Request
 
 on:
+  push:
+    branches-ignore:
+      - "main"
+      - "master"
+      - "development"
   pull_request:
     branches:
-      - main
       - development
 
 env:
     DOCKER_IMAGE: ortussolutions/boxlang
-    BOXLANG_VERSION: 1.0.0
-    IMAGE_VERSION: 1.0.0
+    BOXLANG_VERSION: latest
 
 jobs:
   pr-tests:
@@ -25,7 +28,7 @@ jobs:
             BUILD_IMAGE_TAG: miniserver
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
@@ -42,22 +45,6 @@ jobs:
           DOCKER_IMAGE: ortussolutions/boxlang
           BUILD_IMAGE_TAG: ${{ matrix.BUILD_IMAGE_TAG }}
         run: |
-          # Tag Builds
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-
-            if [[ $BUILD_IMAGE_TAG == latest ]]; then
-              BUILD_IMAGE_TAG="${GITHUB_REF#refs/tags/v}"
-            else
-              BUILD_IMAGE_TAG="${BUILD_IMAGE_TAG}-${GITHUB_REF#refs/tags/v}"
-            fi
-
-          elif [[ $GITHUB_REF == 'refs/heads/development' ]]; then
-
-            # Snapshot builds
-            BUILD_IMAGE_TAG="${BUILD_IMAGE_TAG}-snapshot"
-
-          fi
-
           TAGS="${DOCKER_IMAGE}:${BUILD_IMAGE_TAG}"
 
           if [[ ${BUILD_IMAGE_TAG} == *"alpine"* ]]; then
@@ -68,8 +55,6 @@ jobs:
 
           # Set output parameters.
           echo "arch_platforms=${ARCH_PLATFORMS}" >> $GITHUB_ENV
-          echo "image_version=${IMAGE_VERSION}" >> $GITHUB_ENV
-          echo "boxlang_version=${BOXLANG_VERSION}" >> $GITHUB_ENV
           echo "IMAGE_TAG=${TAGS}" >> $GITHUB_ENV
 
       - name: Build Test Image
@@ -85,13 +70,3 @@ jobs:
           platforms: ${{ env.arch_platforms }}
           push: false
           tags: ${{ env.IMAGE_TAG }}
-
-      # - name: Test
-      #   env:
-      #     boxlang_VERSION: ${{ env.BOXLANG_VERSION }}
-      #     DOCKER_BUILDKIT: 1
-      #     COMPOSE_DOCKER_CLI_BUILD: 1
-      #     BUILD_IMAGE_DOCKERFILE: ${{ matrix.BUILD_IMAGE_DOCKERFILE }}
-      #   run: |
-      #     docker compose -f docker-compose.test.yml up --build --exit-code-from sut
-      #     docker compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ concurrency:
 
 env:
     BOXLANG_VERSION: 1.0.0-beta25
-    IMAGE_VERSION: 1.0.0
+    IMAGE_VERSION: 1.1.0
     # if 'development' it's true, then it's a snapshot build
     SNAPSHOT: ${{ github.ref == 'refs/heads/development' }}
     BUILD_ID: ${{ github.run_number }}git

diff --git a/changelog.md b/changelog.md
@@ -9,47 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.0.0] - 2024-12-13
-
-## [1.0.0] - 2024-12-02
-
-## [1.0.0] - 2024-11-23
-
-## [1.0.0] - 2024-11-15
-
-## [1.0.0] - 2024-11-01
-
-## [1.0.0] - 2024-10-11
-
-## [1.0.0] - 2024-10-04
-
-## [1.0.0] - 2024-09-27
-
-## [1.0.0] - 2024-09-20
-
-## [1.0.0] - 2024-09-06
-
-## [1.0.0] - 2024-08-30
-
-## [1.0.0] - 2024-08-23
-
-## [1.0.0] - 2024-08-16
-
-## [1.0.0] - 2024-08-09
-
-## [1.0.0] - 2024-08-02
-
-## [1.0.0] - 2024-07-26
-
-## [1.0.0] - 2024-07-19
-
-## [1.0.0] - 2024-07-12
-
-## [1.0.0] - 2024-07-05
-
-## [1.0.0] - 2024-06-28
-
-## [1.0.0] - 2024-06-21
+- Updated the install boxlang provider so it can use FORGEBOX.
 
 ## [1.0.0] - 2024-06-14