Skip to content

Commit

Permalink
chore:
Browse files Browse the repository at this point in the history
windows - rubyc.exe
centos, docker - build without bundle exec
  • Loading branch information
YOU54F committed Aug 17, 2023
1 parent 017dc18 commit 4468676
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 9 deletions.
9 changes: 6 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ macos_arm_task:
get_ruby_source_and_patch_script: |
bundle install && bundle exec rake patch_ruby_source
# build_script: | # For OpenSSL 3.1
# bin/rubyc bin/rubyc -o rubyc --openssl-dir=brew --prefix openssl@3.1
# bin/rubyc bin/rubyc -o rubyc --openssl-dir=$(brew --prefix openssl@3.1)
build_script: | # For OpenSSL 3.0
bin/rubyc bin/rubyc -o rubyc --openssl-dir=brew --prefix openssl@3.0
bin/rubyc bin/rubyc -o rubyc --openssl-dir=$(brew --prefix openssl@3.0)
# build_script: | # For OpenSSL 1.1
# bin/rubyc bin/rubyc -o rubyc --openssl-dir=/opt/homebrew/opt/openssl@1.1
# bin/rubyc bin/rubyc -o rubyc --openssl-dir=$(brew --prefix openssl@1.1)
test_script: |
chmod +x ./rubyc
./rubyc --help
Expand All @@ -143,6 +143,9 @@ task:
- arm_container:
matrix:
- dockerfile: Dockerfile
- ∂container:
matrix:
- dockerfile: Dockerfile
test_script: |
rubyc --help
rubyc --version
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,26 @@ jobs:
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir C:\rubyc_tmp
bundle exec rake rubyc
bundle exec rake rubyc.exe
shell: cmd
- name: "Package rubyc"
run: |
mkdir -p pkg
export RUBYC_FILENAME=rubyc-$(uname -s)-$(uname -m).exe
export RUBYC_ARCHIVE_FILENAME=${RUBYC_FILENAME}.tar.gz
cp rubyc.exe pkg/$RUBYC_FILENAME
cd pkg
tar -czvf $RUBYC_ARCHIVE_FILENAME $RUBYC_FILENAME
echo "RUBYC_FILENAME=$RUBYC_FILENAME" >> $GITHUB_ENV
echo "RUBYC_ARCHIVE_FILENAME=$RUBYC_ARCHIVE_FILENAME" >> $GITHUB_ENV
ls -l
if [[ $GITHUB_REF == "refs/heads/$PUBLISH_BRANCH" ]]; then
gh release upload "${NEXT_TAG}" $RUBYC_ARCHIVE_FILENAME --repo "${REPO}" --clobber
else
echo "Not on $PUBLISH_BRANCH branch, skipping upload"
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "[Enclose.IO] Create Windows Test run upload"
uses: actions/upload-artifact@v3
with:
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ RUN ruby --version
RUN bundler --version
WORKDIR /app
COPY . .
RUN bundle install
ARG OPEN_SSL_VERSION=1.1.1v
ENV OPEN_SSL_VERSION=$OPEN_SSL_VERSION
# The latest Traveling ruby 3.2.2 has bundler 2.4.18 installed
RUN bundle _2.4.18_ install
# ARG OPEN_SSL_VERSION=1.1.1v
# ENV OPEN_SSL_VERSION=$OPEN_SSL_VERSION
RUN bundle exec rake patch_ruby_source
RUN bundle exec rake rubyc
# RUN bin/rubyc bin/rubyc -o rubyc
# RUN bundle exec rake rubyc
RUN bin/rubyc bin/rubyc -o rubyc
RUN LD_LIBRARY_PATH=/tmp/rubyc/local/lib:$LD_LIBRARY_PATH ./rubyc --help


Expand Down

0 comments on commit 4468676

Please sign in to comment.