From 5a8c4fde2a936b59c834a97e2f52c27f5729d0b6 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Sat, 28 Jan 2023 21:59:23 +0800 Subject: [PATCH 1/4] Fix mock configs for workflow --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12759381eb..23eeaaf658 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,13 +25,12 @@ jobs: fail-fast: false runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:f38 options: --cap-add=SYS_ADMIN --privileged steps: - uses: terrapkg/anda-build@main with: name: "${{ matrix.pkg }}pkg" - mockConfig: anda-38-${{ matrix.arch }} extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo From 6497680c861aae9d456ee40ef4450f606c3bdbd1 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Sat, 28 Jan 2023 23:30:13 +0800 Subject: [PATCH 2/4] Fix bootstrap --- .github/workflows/autobuild.yml | 2 +- .github/workflows/bootstrap-subatomic.yml | 58 ------------------- .../{bootstrap-anda.yml => bootstrap.yml} | 24 +++++--- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/mass-rebuild.yml | 1 - Untitled-1 | 2 + 7 files changed, 21 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/bootstrap-subatomic.yml rename .github/workflows/{bootstrap-anda.yml => bootstrap.yml} (70%) create mode 100644 Untitled-1 diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index bfe45da7ca..f4a1285f86 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -40,7 +40,7 @@ jobs: fail-fast: false runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:f38 options: --cap-add=SYS_ADMIN --privileged steps: - uses: terrapkg/anda-build@main diff --git a/.github/workflows/bootstrap-subatomic.yml b/.github/workflows/bootstrap-subatomic.yml deleted file mode 100644 index 02adf22286..0000000000 --- a/.github/workflows/bootstrap-subatomic.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Bootstrap subatomic - -on: - workflow_dispatch: - -jobs: - bootstrap: - strategy: - matrix: - version: ["38"] - arch: ["x86_64", "aarch64"] - fail-fast: true - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} - container: - image: fedora:38 - options: --cap-add=SYS_ADMIN --privileged - steps: - # - name: Run shell commands - # run: | - # git config --global url.https://github.com/.insteadOf git://github.com/ - # git clone https://github.com/FyraLabs/anda.git - - - uses: actions/setup-go@v3 - with: - go-version: "^1.19" - - - name: Install repositories - run: | - sudo dnf install -y dnf-plugins-core - sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel - - uses: actions/checkout@v3 - with: - repository: FyraLabs/subatomic - set-safe-directory: true - fetch-depth: 1 - - name: Set up git repository - run: | - git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install Anda - uses: actions-rs/cargo@v1 - with: - command: install - args: anda - - - name: Install Subatomic - run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest - - - name: Build - run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm - - run: | - subatomic-cli upload --prune \ - --server https://subatomic.fyralabs.com \ - --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }} anda-build/rpm/rpms/* diff --git a/.github/workflows/bootstrap-anda.yml b/.github/workflows/bootstrap.yml similarity index 70% rename from .github/workflows/bootstrap-anda.yml rename to .github/workflows/bootstrap.yml index d3a23e651e..78b8eff662 100644 --- a/.github/workflows/bootstrap-anda.yml +++ b/.github/workflows/bootstrap.yml @@ -1,4 +1,4 @@ -name: Bootstrap anda +name: Bootstrap Andaman and Subatomic on: workflow_dispatch: @@ -15,9 +15,6 @@ jobs: image: fedora:38 options: --cap-add=SYS_ADMIN --privileged steps: - - uses: actions/checkout@v3 - with: - repository: FyraLabs/anda - uses: actions/setup-go@v3 with: go-version: "^1.19" @@ -26,7 +23,11 @@ jobs: run: | sudo dnf install -y dnf-plugins-core sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel + sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel + - uses: actions/checkout@v3 + with: + repository: FyraLabs/subatomic + ref: bootstrap - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -36,13 +37,20 @@ jobs: command: install args: anda + - name: Build Subatomic + run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm - name: Install Subatomic - run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest + run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm - - name: Build + - uses: actions/checkout@v3 + with: + repository: FyraLabs/anda + + - name: Build Andaman run: anda build -c anda-38-${{ matrix.arch }} anda -p rpm - - run: | + - name: Upload to Subatomic + run: | subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23eeaaf658..d48e9757db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: packages: - description: "Packages to Build (pkg-a, pkg-b, ...)" + description: "Packages to Build" required: true jobs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9800f36cac..3720348bb3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,7 +6,7 @@ jobs: lint: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:f38 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml index 59f4e73398..205f1e79dc 100644 --- a/.github/workflows/mass-rebuild.yml +++ b/.github/workflows/mass-rebuild.yml @@ -60,7 +60,6 @@ jobs: if: steps.check_files.outputs.EXISTS == 'true' with: name: "${{ matrix.pkg }}pkg" - mockConfig: anda-38-${{ matrix.arch }} extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo diff --git a/Untitled-1 b/Untitled-1 new file mode 100644 index 0000000000..a13d048655 --- /dev/null +++ b/Untitled-1 @@ -0,0 +1,2 @@ +anda/apps/anki-bin anda/apps/anki-qt5 anda/apps/anki anda/apps/authy anda/apps/discord-canary-openasar anda/apps/discord-canary anda/apps/discord-openasar anda/apps/discord-ptb-openasar anda/apps/discord-ptb anda/apps/discord anda/apps/tectonic anda/audio/distrho anda/dart anda/desktops/budgie/budgie-extras anda/desktops/elementary/contractor anda/desktops/elementary/elementary-calculator anda/desktops/elementary/elementary-calendar anda/desktops/elementary/elementary-camera anda/desktops/elementary/elementary-capnet-assist anda/desktops/elementary/elementary-code anda/desktops/elementary/elementary-files anda/desktops/elementary/elementary-greeter anda/desktops/elementary/elementary-icon-theme anda/desktops/elementary/elementary-music anda/desktops/elementary/elementary-notifications anda/desktops/elementary/elementary-onboarding anda/desktops/elementary/elementary-photos anda/desktops/elementary/elementary-print anda/desktops/elementary/elementary-screenshot-tool anda/desktops/elementary/elementary-settings-daemon anda/desktops/elementary/elementary-shortcut-overlay anda/desktops/elementary/elementary-sideload anda/desktops/elementary/elementary-sound-theme anda/desktops/elementary/elementary-terminal anda/desktops/elementary/elementary-theme anda/desktops/elementary/elementary-videos anda/desktops/elementary/elementary-wallpapers anda/desktops/elementary/gala anda/desktops/elementary/granite-7 anda/desktops/elementary/pantheon-agent-geoclue2 anda/desktops/elementary/pantheon-agent-polkit anda/desktops/elementary/pantheon-session-settings anda/desktops/elementary/pantheon-tweaks anda/desktops/elementary/switchboard-plug-a11y anda/desktops/elementary/switchboard-plug-about anda/desktops/elementary/switchboard-plug-applications anda/desktops/elementary/switchboard-plug-bluetooth anda/desktops/elementary/switchboard-plug-display anda/desktops/elementary/switchboard-plug-keyboard anda/desktops/elementary/switchboard-plug-mouse-touchpad +anda/desktops/elementary/switchboard-plug-networking anda/desktops/elementary/switchboard-plug-notifications anda/desktops/elementary/switchboard-plug-onlineaccounts anda/desktops/elementary/switchboard-plug-pantheon-shell anda/desktops/elementary/switchboard-plug-printers anda/desktops/elementary/switchboard-plug-sharing anda/desktops/elementary/switchboard-plug-sound anda/desktops/elementary/switchboard-plug-tweaks anda/desktops/elementary/switchboard anda/desktops/elementary/wingpanel-applications-menu anda/desktops/elementary/wingpanel-indicator-bluetooth anda/desktops/elementary/wingpanel-indicator-datetime anda/desktops/elementary/wingpanel-indicator-keyboard anda/desktops/elementary/wingpanel-indicator-network anda/desktops/elementary/wingpanel-indicator-nightlight anda/desktops/elementary/wingpanel-indicator-notifications anda/desktops/elementary/wingpanel-indicator-power anda/desktops/elementary/wingpanel-indicator-session anda/desktops/elementary/wingpanel-indicator-sound anda/desktops/elementary/wingpanel anda/desktops/kde/latte-dock-nightly anda/fonts/arphic-ukai anda/fonts/arphic-uming anda/fonts/hannom anda/fonts/iosevka-fusion anda/fonts/kanjistrokeorders anda/fonts/manrope anda/fonts/mini-wakuwaku anda/fonts/naikai anda/fonts/nerd-fonts anda/fonts/seto anda/fonts/vl-gothic anda/games/minecraft-java anda/games/prismlauncher-nightly anda/games/prismlauncher-qt5-nightly anda/games/prismlauncher-qt5 anda/games/prismlauncher anda/go/curlie anda/lib/argagg anda/lib/libappimage anda/lib/libappimageupdate anda/lib/libbismuth anda/lib/libhelium anda/lib/nlohmann-json anda/moby-extras/moby-buildx anda/moby-extras/moby-compose anda/mock-configs anda/nim/choosenim anda/nim/nim anda/others/blackbox-terminal anda/others/sass anda/others/tau-helium anda/others/tau-hydrogen anda/python/orjson anda/python/protobuf anda/python/python3-protobuf anda/python/ruff anda/rust/bat-extras anda/rust/joshuto anda/rust/maturin anda/rust/pop-launcher anda/rust/rnote anda/rust/sccache anda/rust/starship anda/rust/youki anda/rust/zellij anda/rust/zoxide anda/srpm-macros anda/themes/adwaita++-icons anda/themes/bibata-cursor-theme anda/tools/appimagelauncher anda/tools/fuc anda/tools/gcm-core anda/tools/lorax anda/tools/melody anda/tools/muon anda/tools/vala-language-server-nightly From f96118ae03622d24e8f56c49efb1d59f4d54529b Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Sat, 28 Jan 2023 23:34:03 +0800 Subject: [PATCH 3/4] Delete Untitled-1 Signed-off-by: windowsboy111 --- Untitled-1 | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Untitled-1 diff --git a/Untitled-1 b/Untitled-1 deleted file mode 100644 index a13d048655..0000000000 --- a/Untitled-1 +++ /dev/null @@ -1,2 +0,0 @@ -anda/apps/anki-bin anda/apps/anki-qt5 anda/apps/anki anda/apps/authy anda/apps/discord-canary-openasar anda/apps/discord-canary anda/apps/discord-openasar anda/apps/discord-ptb-openasar anda/apps/discord-ptb anda/apps/discord anda/apps/tectonic anda/audio/distrho anda/dart anda/desktops/budgie/budgie-extras anda/desktops/elementary/contractor anda/desktops/elementary/elementary-calculator anda/desktops/elementary/elementary-calendar anda/desktops/elementary/elementary-camera anda/desktops/elementary/elementary-capnet-assist anda/desktops/elementary/elementary-code anda/desktops/elementary/elementary-files anda/desktops/elementary/elementary-greeter anda/desktops/elementary/elementary-icon-theme anda/desktops/elementary/elementary-music anda/desktops/elementary/elementary-notifications anda/desktops/elementary/elementary-onboarding anda/desktops/elementary/elementary-photos anda/desktops/elementary/elementary-print anda/desktops/elementary/elementary-screenshot-tool anda/desktops/elementary/elementary-settings-daemon anda/desktops/elementary/elementary-shortcut-overlay anda/desktops/elementary/elementary-sideload anda/desktops/elementary/elementary-sound-theme anda/desktops/elementary/elementary-terminal anda/desktops/elementary/elementary-theme anda/desktops/elementary/elementary-videos anda/desktops/elementary/elementary-wallpapers anda/desktops/elementary/gala anda/desktops/elementary/granite-7 anda/desktops/elementary/pantheon-agent-geoclue2 anda/desktops/elementary/pantheon-agent-polkit anda/desktops/elementary/pantheon-session-settings anda/desktops/elementary/pantheon-tweaks anda/desktops/elementary/switchboard-plug-a11y anda/desktops/elementary/switchboard-plug-about anda/desktops/elementary/switchboard-plug-applications anda/desktops/elementary/switchboard-plug-bluetooth anda/desktops/elementary/switchboard-plug-display anda/desktops/elementary/switchboard-plug-keyboard anda/desktops/elementary/switchboard-plug-mouse-touchpad -anda/desktops/elementary/switchboard-plug-networking anda/desktops/elementary/switchboard-plug-notifications anda/desktops/elementary/switchboard-plug-onlineaccounts anda/desktops/elementary/switchboard-plug-pantheon-shell anda/desktops/elementary/switchboard-plug-printers anda/desktops/elementary/switchboard-plug-sharing anda/desktops/elementary/switchboard-plug-sound anda/desktops/elementary/switchboard-plug-tweaks anda/desktops/elementary/switchboard anda/desktops/elementary/wingpanel-applications-menu anda/desktops/elementary/wingpanel-indicator-bluetooth anda/desktops/elementary/wingpanel-indicator-datetime anda/desktops/elementary/wingpanel-indicator-keyboard anda/desktops/elementary/wingpanel-indicator-network anda/desktops/elementary/wingpanel-indicator-nightlight anda/desktops/elementary/wingpanel-indicator-notifications anda/desktops/elementary/wingpanel-indicator-power anda/desktops/elementary/wingpanel-indicator-session anda/desktops/elementary/wingpanel-indicator-sound anda/desktops/elementary/wingpanel anda/desktops/kde/latte-dock-nightly anda/fonts/arphic-ukai anda/fonts/arphic-uming anda/fonts/hannom anda/fonts/iosevka-fusion anda/fonts/kanjistrokeorders anda/fonts/manrope anda/fonts/mini-wakuwaku anda/fonts/naikai anda/fonts/nerd-fonts anda/fonts/seto anda/fonts/vl-gothic anda/games/minecraft-java anda/games/prismlauncher-nightly anda/games/prismlauncher-qt5-nightly anda/games/prismlauncher-qt5 anda/games/prismlauncher anda/go/curlie anda/lib/argagg anda/lib/libappimage anda/lib/libappimageupdate anda/lib/libbismuth anda/lib/libhelium anda/lib/nlohmann-json anda/moby-extras/moby-buildx anda/moby-extras/moby-compose anda/mock-configs anda/nim/choosenim anda/nim/nim anda/others/blackbox-terminal anda/others/sass anda/others/tau-helium anda/others/tau-hydrogen anda/python/orjson anda/python/protobuf anda/python/python3-protobuf anda/python/ruff anda/rust/bat-extras anda/rust/joshuto anda/rust/maturin anda/rust/pop-launcher anda/rust/rnote anda/rust/sccache anda/rust/starship anda/rust/youki anda/rust/zellij anda/rust/zoxide anda/srpm-macros anda/themes/adwaita++-icons anda/themes/bibata-cursor-theme anda/tools/appimagelauncher anda/tools/fuc anda/tools/gcm-core anda/tools/lorax anda/tools/melody anda/tools/muon anda/tools/vala-language-server-nightly From ff63a00a68adcaad0b7871dfc21f13be8eea7392 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Sat, 28 Jan 2023 23:35:46 +0800 Subject: [PATCH 4/4] Fine let's just lint with main Signed-off-by: windowsboy111 --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3720348bb3..9800f36cac 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,7 +6,7 @@ jobs: lint: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f38 + image: ghcr.io/terrapkg/builder:main steps: - name: Checkout repository uses: actions/checkout@v3