diff options
| -rw-r--r-- | .github/workflows/test-pr-temp.yaml | 15 | ||||
| -rw-r--r-- | src/oryx/devcontainer-feature.json | 1 | ||||
| -rwxr-xr-x | src/oryx/install.sh | 6 |
3 files changed, 19 insertions, 3 deletions
diff --git a/.github/workflows/test-pr-temp.yaml b/.github/workflows/test-pr-temp.yaml new file mode 100644 index 0000000..3f3dbe9 --- /dev/null +++ b/.github/workflows/test-pr-temp.yaml @@ -0,0 +1,15 @@ +name: "test" +on: + pull_request: + paths-ignore: + - ./**/oryx/** + - ./**/java/** + - ./**/dotnet/** + - ./**/php/** + - ./**/node/** + +jobs: + test: + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required ; Temporary tweak for merging the PRs until branch protection rules are updated"' diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json index 2b569aa..d313854 100644 --- a/src/oryx/devcontainer-feature.json +++ b/src/oryx/devcontainer-feature.json @@ -8,6 +8,7 @@ "DYNAMIC_INSTALL_ROOT_DIR": "/usr/local/oryx-platforms", "ORYX_PREFER_USER_INSTALLED_SDKS": "true", "ORYX_DIR": "/usr/local/oryx", + "DEBIAN_FLAVOR": "focal-scm", "PATH": "${ORYX_DIR}:${PATH}" }, "install": { diff --git a/src/oryx/install.sh b/src/oryx/install.sh index 1f0f94d..0aeb8bd 100755 --- a/src/oryx/install.sh +++ b/src/oryx/install.sh @@ -104,7 +104,7 @@ if ! oryx --version > /dev/null ; then BUILD_SCRIPT_GENERATOR=/usr/local/buildscriptgen ORYX=/usr/local/oryx - GIT_ORYX=/tmp/oryx + GIT_ORYX=/opt/tmp mkdir -p ${BUILD_SCRIPT_GENERATOR} mkdir -p ${ORYX} @@ -122,10 +122,10 @@ if ! oryx --version > /dev/null ; then ln -s ${BUILD_SCRIPT_GENERATOR}/GenerateBuildScript ${ORYX}/oryx cp -f $GIT_ORYX/images/build/benv.sh ${ORYX}/benv - ORYX_INSTALL_DIR="/usr/local/oryx-platforms" + ORYX_INSTALL_DIR="/opt" mkdir -p "${ORYX_INSTALL_DIR}" - updaterc "export ORYX_SDK_STORAGE_BASE_URL=https://oryx-cdn.microsoft.io && export ENABLE_DYNAMIC_INSTALL=true && DYNAMIC_INSTALL_ROOT_DIR=$ORYX_INSTALL_DIR && ORYX_PREFER_USER_INSTALLED_SDKS=true" + updaterc "export ORYX_SDK_STORAGE_BASE_URL=https://oryx-cdn.microsoft.io && export ENABLE_DYNAMIC_INSTALL=true && DYNAMIC_INSTALL_ROOT_DIR=$ORYX_INSTALL_DIR && ORYX_PREFER_USER_INSTALLED_SDKS=true && export DEBIAN_FLAVOR=focal-scm" chown -R "${USERNAME}:oryx" "${ORYX_INSTALL_DIR}" "${BUILD_SCRIPT_GENERATOR}" "${ORYX}" chmod -R g+r+w "${ORYX_INSTALL_DIR}" "${BUILD_SCRIPT_GENERATOR}" "${ORYX}" |