From a634ca1b1a2ff61f61720bedee6b86b912ed1968 Mon Sep 17 00:00:00 2001 From: JohnVictoryz Date: Sun, 29 Oct 2023 20:10:01 +0200 Subject: [PATCH 01/11] Fix CI --- .github/workflows/ourcustomci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 5455669..e8eca06 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Install libcurl run: sudo apt-get install libcurl4-gnutls-dev -y - - name: configure libspm - run: git clone https://github.com/Soviet-Linux/libspm && cd libspm && make all && make formats && make test && sudo make install + - name: configure libspm and test files + run: git clone https://github.com/Soviet-Linux/libspm && cd libspm && make all && make formats && make test && sudo make install && sudo ln -s bin/spm-test /bin/spm-test - name: Try .ecmp files - run: ./bin/spm-test install ../testing/src/*.ecmp && ./bin/spm-test install ../lxde/src/*.ecmp && ./bin/spm-test install ../xorg/src/*.ecmp && ./bin/spm-test install ../xfce/src/*.ecmp && ./bin/spm-test install ../kde/src/*.ecmp && ./bin/spm-test install ../base/src/*.ecmp \ No newline at end of file + run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp \ No newline at end of file From 06cec44c71340092722d3b7b5b2f502f4b4aa3c1 Mon Sep 17 00:00:00 2001 From: JohnVictoryz Date: Sun, 29 Oct 2023 20:13:13 +0200 Subject: [PATCH 02/11] Fix CI --- .github/workflows/ourcustomci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index e8eca06..ac2be54 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -18,6 +18,4 @@ jobs: - name: Install libcurl run: sudo apt-get install libcurl4-gnutls-dev -y - name: configure libspm and test files - run: git clone https://github.com/Soviet-Linux/libspm && cd libspm && make all && make formats && make test && sudo make install && sudo ln -s bin/spm-test /bin/spm-test - - name: Try .ecmp files - run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp \ No newline at end of file + run: git clone https://github.com/Soviet-Linux/libspm && cd libspm && make all && make formats && make test && sudo make install && sudo ln -s bin/spm-test /bin/spm-test && spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp From 1470c169758acfd54841ade6522f8e82cbf62b22 Mon Sep 17 00:00:00 2001 From: ilovethensa <145558184+ilovethensa@users.noreply.github.com> Date: Sun, 29 Oct 2023 20:58:20 +0200 Subject: [PATCH 03/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index ac2be54..9042204 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -11,11 +11,9 @@ jobs: build: - runs-on: ubuntu-latest + runs-on: ghcr.io/soviet-linux/cccp:sha256-b57f307e4817a525a76ae581bc0220f97073d19806c4ddf8649eaae3df1b956d.sig steps: - uses: actions/checkout@v3 - - name: Install libcurl - run: sudo apt-get install libcurl4-gnutls-dev -y - - name: configure libspm and test files - run: git clone https://github.com/Soviet-Linux/libspm && cd libspm && make all && make formats && make test && sudo make install && sudo ln -s bin/spm-test /bin/spm-test && spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp + - name: Test packages + run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp From a09d19ba0b674a5fc3dcda1a1a06ab15f3d301e3 Mon Sep 17 00:00:00 2001 From: ilovethensa <145558184+ilovethensa@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:07:32 +0200 Subject: [PATCH 04/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 9042204..6452287 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -11,9 +11,9 @@ jobs: build: - runs-on: ghcr.io/soviet-linux/cccp:sha256-b57f307e4817a525a76ae581bc0220f97073d19806c4ddf8649eaae3df1b956d.sig + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Test packages - run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp + run: docker run ghcr.io/soviet-linux/cccp spm-test install testing/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install lxde/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install kde/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install base/src/*.ecmp From b75052c7d72924f0124e58d3c8b7a515d6762354 Mon Sep 17 00:00:00 2001 From: ilovethensa <145558184+ilovethensa@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:09:23 +0200 Subject: [PATCH 05/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 6452287..52fc798 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -15,5 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Get container + run: docker pull ghcr.io/soviet-linux/cccp:sha256-b57f307e4817a525a76ae581bc0220f97073d19806c4ddf8649eaae3df1b956d.sig - name: Test packages - run: docker run ghcr.io/soviet-linux/cccp spm-test install testing/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install lxde/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install kde/src/*.ecmp && docker run ghcr.io/soviet-linux/cccp spm-test install base/src/*.ecmp + run: docker run cccp spm-test install testing/src/*.ecmp && docker run cccp spm-test install lxde/src/*.ecmp && docker run cccp spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && docker run cccp spm-test install kde/src/*.ecmp && docker run cccp spm-test install base/src/*.ecmp From d6d05afd5d133175a8fbeb42ef74a87e13d8bc8c Mon Sep 17 00:00:00 2001 From: ilovethensa <145558184+ilovethensa@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:13:14 +0200 Subject: [PATCH 06/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 52fc798..8a3800d 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -12,10 +12,9 @@ jobs: runs-on: ubuntu-latest + container: ghcr.io/soviet-linux/cccp steps: - uses: actions/checkout@v3 - - name: Get container - run: docker pull ghcr.io/soviet-linux/cccp:sha256-b57f307e4817a525a76ae581bc0220f97073d19806c4ddf8649eaae3df1b956d.sig - name: Test packages - run: docker run cccp spm-test install testing/src/*.ecmp && docker run cccp spm-test install lxde/src/*.ecmp && docker run cccp spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && docker run cccp spm-test install kde/src/*.ecmp && docker run cccp spm-test install base/src/*.ecmp + run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp From 18e3c79d8d6b21d90c432ec96b1ac760c946ef79 Mon Sep 17 00:00:00 2001 From: tutel <85512286+JohnVictoryz@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:13:36 +0200 Subject: [PATCH 07/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 8a3800d..ad9a58b 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -11,7 +11,7 @@ jobs: build: - runs-on: ubuntu-latest + runs-on: ghcr.io/soviet-linux/cccp container: ghcr.io/soviet-linux/cccp steps: From cb7ecf32716aa0d8450b70779f6b44643bda3045 Mon Sep 17 00:00:00 2001 From: ilovethensa <145558184+ilovethensa@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:17:47 +0200 Subject: [PATCH 08/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index ad9a58b..8a3800d 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -11,7 +11,7 @@ jobs: build: - runs-on: ghcr.io/soviet-linux/cccp + runs-on: ubuntu-latest container: ghcr.io/soviet-linux/cccp steps: From 6aa2880e906afe4a2b808d8c8cfd94dc691931ed Mon Sep 17 00:00:00 2001 From: tutel <85512286+JohnVictoryz@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:22:12 +0200 Subject: [PATCH 09/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 8a3800d..3a1cad0 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -16,5 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Init Container + run: docker pull ghcr.io/soviet-linux/cccp - name: Test packages run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp From 9edc007cc0a8aa2fc46fdd81bc89ffb46ac17fff Mon Sep 17 00:00:00 2001 From: tutel <85512286+JohnVictoryz@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:23:38 +0200 Subject: [PATCH 10/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 3a1cad0..8a3800d 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -16,7 +16,5 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Init Container - run: docker pull ghcr.io/soviet-linux/cccp - name: Test packages run: spm-test install testing/src/*.ecmp && spm-test install lxde/src/*.ecmp && spm-test install xorg/src/*.ecmp && spm-test install xfce/src/*.ecmp && spm-test install kde/src/*.ecmp && spm-test install base/src/*.ecmp From d1f953e0663ebbcc12ae322ebcd9362b0471a326 Mon Sep 17 00:00:00 2001 From: ilovethensa <145558184+ilovethensa@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:32:21 +0200 Subject: [PATCH 11/11] Update ourcustomci.yml --- .github/workflows/ourcustomci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ourcustomci.yml b/.github/workflows/ourcustomci.yml index 8a3800d..7104f5c 100644 --- a/.github/workflows/ourcustomci.yml +++ b/.github/workflows/ourcustomci.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest - container: ghcr.io/soviet-linux/cccp + container: ghcr.io/soviet-linux/cccp:main steps: - uses: actions/checkout@v3