From f453c21724db64b5e69fb876c8e9c79df3fc3ce5 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 28 Sep 2024 10:23:11 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B0=20oscript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e9976f5 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build Docker Images + +on: + push: + branches: [ feature/first-bit] + pull_request: + branches: [ feature/first-bit] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build Docker images + run: | + docker build -t oscript:latest oscript From 46957e1a4bc7410212523e4a4958626c9d80b77f Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 28 Sep 2024 10:24:27 +0200 Subject: [PATCH 2/5] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9976f5..364ff42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,4 +22,4 @@ jobs: - name: Build Docker images run: | - docker build -t oscript:latest oscript + docker build -t oscript:latest -f oscript/Dockerfile . From b381d6838f14a437622acb2a9dcc77dc5f4aa6d5 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 28 Sep 2024 10:33:34 +0200 Subject: [PATCH 3/5] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D1=82=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oscript/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscript/Dockerfile b/oscript/Dockerfile index 2817066..a48966a 100644 --- a/oscript/Dockerfile +++ b/oscript/Dockerfile @@ -37,7 +37,7 @@ RUN chmod +x /remove-dst-root-ca-x3.sh \ # Installing oscript ARG OVM_REPOSITORY_OWNER=oscript-library -ARG OVM_VERSION=v1.2.2 +ARG OVM_VERSION=v1.0.0-RC16 ARG ONESCRIPT_VERSION=stable ARG ONESCRIPT_PACKAGES="add gitsync vanessa-runner stebi edt-ripper" From fe47cd28b4b46e5dd37c94b81a3aee9d4502e325 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 28 Sep 2024 11:29:23 +0200 Subject: [PATCH 4/5] Update build.yml --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 364ff42..3d65eeb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,9 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + dir: [ 'oscript' ] steps: - name: Checkout repository @@ -22,4 +25,4 @@ jobs: - name: Build Docker images run: | - docker build -t oscript:latest -f oscript/Dockerfile . + docker build -t oscript:latest -f ${{ matrix.dir }}/Dockerfile . From 2bad8484f9a489f48ec58274325e84ee9a6696ce Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 28 Sep 2024 11:42:14 +0200 Subject: [PATCH 5/5] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d65eeb..70c5925 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,13 +5,14 @@ on: branches: [ feature/first-bit] pull_request: branches: [ feature/first-bit] + workflow_dispatch: jobs: build: runs-on: ubuntu-latest strategy: matrix: - dir: [ 'oscript' ] + dir: [ 'jdk', 'oscript' ] steps: - name: Checkout repository