Merge pull request #30 from runwaylab/bump-octokit

Bump octokit

.crystal-version

@@ -1 +1 @@
-1.12.1
+1.13.1

.github/workflows/acceptance.yml

@@ -20,7 +20,7 @@ jobs:
 
       - name: fetch crystal version
         id: crystal-version
-        run: echo "crystal=$(cat .crystal-version)"
+        run: echo "crystal=$(cat .crystal-version)" >> $GITHUB_OUTPUT
 
       - name: install crystal
         uses: crystal-lang/[email protected]

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: fetch crystal version
         id: crystal-version
-        run: echo "crystal=$(cat .crystal-version)"
+        run: echo "crystal=$(cat .crystal-version)" >> $GITHUB_OUTPUT
 
       - name: install crystal
         uses: crystal-lang/[email protected]

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: fetch crystal version
         id: crystal-version
-        run: echo "crystal=$(cat .crystal-version)"
+        run: echo "crystal=$(cat .crystal-version)" >> $GITHUB_OUTPUT
 
       - name: install crystal
         uses: crystal-lang/[email protected]

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
 
       - name: fetch crystal version
         id: crystal-version
-        run: echo "crystal=$(cat .crystal-version)"
+        run: echo "crystal=$(cat .crystal-version)" >> $GITHUB_OUTPUT
 
       - name: install crystal
         uses: crystal-lang/[email protected]

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: fetch crystal version
         id: crystal-version
-        run: echo "crystal=$(cat .crystal-version)"
+        run: echo "crystal=$(cat .crystal-version)" >> $GITHUB_OUTPUT
 
       - name: install crystal
         uses: crystal-lang/[email protected]

acceptance/logs/expected.log

@@ -3,7 +3,7 @@ INFO: 📖 loading runway configuration
 DEBUG: attempting to load config from acceptance/config/config.yml
 INFO: ✅ loaded configuration successfully
 INFO: 🚚 2 projects loaded
-INFO: 🛫 starting runway - version: v0.1.0
+INFO: 🛫 starting runway - version: v0.2.0
 INFO: 📦 starting project project-1
 INFO: 🕐 scheduling event with interval 3s for project-1
 INFO: 📦 starting project project-2

lib/.shards.info

@@ -9,7 +9,7 @@ shards:
     version: 0.12.0
   octokit:
     git: https://github.com/octokit-cr/octokit.cr.git
-    version: 0.2.4
+    version: 0.2.5
   emoji:
     git: https://github.com/veelenga/emoji.cr.git
     version: 0.5.0

lib/octokit/.crystal-version

@@ -1 +1 @@
-1.12.1
+1.13.1

lib/octokit/script/release

@@ -13,8 +13,8 @@ latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1))
 echo -e "The latest release tag is: ${BLUE}${latest_tag}${OFF}"
 read -p 'New Release Tag (vX.X.X format): ' new_tag
 
-tag_regex='^v\d\.\d\.\d$'
-echo "$new_tag" | grep -P -q $tag_regex
+tag_regex='^v[0-9]+\.[0-9]+\.[0-9]+$'
+echo "$new_tag" | grep -E "$tag_regex"
 
 if [[ $? -ne 0 ]]; then
   echo -e "${RED}ERROR${OFF} - Tag: $new_tag is not valid. Please use vX.X.X format."

lib/octokit/shard.yml

@@ -1,11 +1,11 @@
 name: octokit
-version: 0.2.4
+version: 0.2.5
 
 authors:
   - Grant Birkinbine
   - Chris Watson <[email protected]>
 
-crystal: ">= 1.12.1"
+crystal: ">= 1.13.1"
 
 license: MIT
 

lib/octokit/src/octokit/version.cr

@@ -1,3 +1,3 @@
 module Octokit
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

lib/spectator/src/spectator/dsl/mocks.cr

@@ -431,7 +431,7 @@ module Spectator::DSL
          # This isn't required, but new_mock() should still find this type.
          ::Spectator::DSL::Mocks::TYPES << {type.id.symbolize, @type.name(generic_args: false).symbolize, resolved.name.symbolize} %}
 
-      ::Spectator::Mock.inject({{base}}, ::{{resolved.name}}, {{**value_methods}}) {{block}}
+      ::Spectator::Mock.inject({{base}}, {{resolved.name}}, {{**value_methods}}) {{block}}
     end
 
     # Targets a stubbable object (such as a mock or double) for operations.

script/postinstall

@@ -3,12 +3,14 @@
 # set the working directory to the root of the project
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 LINUX_VENDOR_DIR="$DIR/vendor/linux_x86_64/bin"
-DARWIN_VENDOR_DIR="$DIR/vendor/darwin_x86_64/bin"
+DARWIN_VENDOR_DIR_X64="$DIR/vendor/darwin_x86_64/bin"
+DARWIN_VENDOR_DIR_ARM64="$DIR/vendor/darwin_arm64/bin"
 
 mkdir -p "$DIR/bin"
 
 # Determine if the system is a Mac or Linux
 os="unknown"
+arch="unknown"
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
   os="linux"
   if [ "$CI" = true ]; then
@@ -29,12 +31,22 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
   fi
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   os="mac"
+  arch=$(uname -m)
   if [ "$CI" = true ]; then
     echo "OSTYPE: $OSTYPE"
+    echo "ARCH: $arch"
     echo "running in CI mode, copying vendored binaries to bin/ directory (mac)"
-    cp "$DARWIN_VENDOR_DIR/ameba" "$DIR/bin/ameba"
-    cp "$DARWIN_VENDOR_DIR/crkcov" "$DIR/bin/crkcov"
-    cp "$DARWIN_VENDOR_DIR/kcov" "$DIR/bin/kcov"
+    if [ "$arch" = "x86_64" ]; then
+      cp "$DARWIN_VENDOR_DIR_X64/ameba" "$DIR/bin/ameba"
+      cp "$DARWIN_VENDOR_DIR_X64/crkcov" "$DIR/bin/crkcov"
+      cp "$DARWIN_VENDOR_DIR_X64/kcov" "$DIR/bin/kcov"
+    elif [ "$arch" = "arm64" ]; then
+      cp "$DARWIN_VENDOR_DIR_ARM64/ameba" "$DIR/bin/ameba"
+      cp "$DARWIN_VENDOR_DIR_ARM64/crkcov" "$DIR/bin/crkcov"
+      cp "$DARWIN_VENDOR_DIR_ARM64/kcov" "$DIR/bin/kcov"
+    else
+      echo "Unknown architecture: $arch"
+    fi
   fi
 else
   os="unknown"

script/release

@@ -13,8 +13,8 @@ latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1))
 echo -e "The latest release tag is: ${BLUE}${latest_tag}${OFF}"
 read -p 'New Release Tag (vX.X.X format): ' new_tag
 
-tag_regex='^v\d\.\d\.\d$'
-echo "$new_tag" | grep -P -q $tag_regex
+tag_regex='^v[0-9]+\.[0-9]+\.[0-9]+$'
+echo "$new_tag" | grep -E "$tag_regex"
 
 if [[ $? -ne 0 ]]; then
   echo -e "${RED}ERROR${OFF} - Tag: $new_tag is not valid. Please use vX.X.X format."

shard.lock

@@ -34,7 +34,7 @@ shards:
 
   octokit:
     git: https://github.com/octokit-cr/octokit.cr.git
-    version: 0.2.4
+    version: 0.2.5
 
   retriable:
     git: https://github.com/sija/retriable.cr.git

shard.yml

@@ -1,5 +1,5 @@
 name: runway
-version: 0.1.0
+version: 0.2.0
 
 authors:
   - GrantBirki
@@ -8,14 +8,14 @@ targets:
   runway:
     main: src/cli.cr
 
-crystal: ">= 1.12.1"
+crystal: ">= 1.13.1"
 
 license: MIT
 
 dependencies:
   octokit:
     github: octokit-cr/octokit.cr
-    version: ~> 0.2.4
+    version: ~> 0.2.5
   emoji:
     github: veelenga/emoji.cr
     version: ~> 0.5.0

src/version.cr

@@ -1,3 +1,3 @@
 module Runway
-  VERSION = "v0.0.6"
+  VERSION = "v0.2.0"
 end