Skip to content

Commit

Permalink
Merge pull request #54 from oblakstudio/fix/arch-detect
Browse files Browse the repository at this point in the history
Architecture detection
  • Loading branch information
seebeen authored Jul 9, 2024
2 parents f0ec813 + 8fc4537 commit 3c27958
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 22 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/cron_tests.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: "Daily tests"
on:
pull_request:
push:
branches:
- master

schedule:
- cron: "25 08 * * *"

Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,11 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.OBLAKBOT_PAT }}
- name: Import GPG keys
uses: crazy-max/ghaction-import-gpg@v6
id: gpg
with:
gpg_private_key: ${{ secrets.OBLAKBOT_GPG_KEY }}
passphrase: ${{ secrets.OBLAKBOT_GPG_PASS }}
git_config_global: true
git_user_signingkey: true
git_commit_gpgsign: true
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v4
with:
extra_plugins: |
@semantic-release/github
@semantic-release/exec
env:
token: ${{ secrets.OBLAKBOT_PAT }}
token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions install.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: ddev-ioncube

project_files:
- web-build/ioncube/download-loaders
- web-build/ioncube/modify-dockerfile
- web-build/ioncube/download-loaders.sh
- web-build/ioncube/modify-dockerfile.sh

post_install_actions:
- |
#ddev-description: Download IonCube Loaders
#
./web-build/ioncube/download-loaders
./web-build/ioncube/download-loaders.sh
- |
#ddev-description: Modify Dockerfile
./web-build/ioncube/modify-dockerfile
./web-build/ioncube/modify-dockerfile.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash
#ddev-generated
set -e
ARCH=$(/usr/bin/arch)

if [ "$ARCH" = "arm64" ]; then
ARCH="$(uname -m)"

if [ "$ARCH" = "aarch64" ]; then
ARCH="aarch64"
elif [ "$ARCH" = "x86_64" ]; then
ARCH="x86-64"
Expand Down
File renamed without changes.

0 comments on commit 3c27958

Please sign in to comment.