PA #2

             
Purpose
        To demonstrate the skills of working with git branches.
    Requirements
    • The equation that you need to work upon is shown on the image below (take equation that equals to your number in the list of the group you study at).
    • Create a new repo in github, clone the repo to a local directory.
    • Create files suite with a source code in cpp language: a cpp/h file pair holding a class with a public function named FuncA calculating a trigonometric function returning value 0, and the file named main.cpp that instantiates the class and calls the function; Push the code to a branch named master;
    • Branch out from master, naming a new branch branchA. In branchA update the implementation of FuncA calculating function result value as the sum of the first n elements of an infinite sequence (see variants table). Make n as a function argument. Stash your changes.
    • Branch out from master branch creating a new branch named hotfix; In hotfix update the implementation of FuncA returning its value as the sum of the first 3 elements of an infinite sequence. Commit the code and push to the repo;
    • Merge hotfix branch into master branch;
    • Switch back to the branch branchA. Stash pop your intermediate result. Finish the implementation, add comments to the class and its function about the param meaning. Commit the changes.
    • Switch to master branch, get the latest updates, try to merge BranchA into the branch. Resolve the conflict in favor of branchA changes. Take a screenshot of a 3-way diffmerge vimdiff contents when merging. Commit and push.
    • Make a photo/screenshot showing the log of branch history.

    Presentation

    • Submit a link to github repo, an image showing 3-way merge contents of vimdiff and an image of a branch log final history through this form.

    Assessment

    8 points maximum

    Variants


    ТР-21

    ТР-22

    ТР-23
    ТР-24
    ТР-25

    Comments

    Post a Comment

    Popular posts from this blog

    PA #5

    Image
    Purpose           To demonstrate the skills of optimizing docker images with multistage build and preparation of docker images for multiple CPU architectures Requirements Switch to branchHTTPserver branch. Prepare continuous integration github action that builds docker images for two architectures:  amd64 and arm64 . Create a manifest joining two images into a single multiarchitecture image. Push the manifest to docker hub Branch out from branchHTTPserver  branch creating branchHTTPservMutli . Modify your Dockerfile so it: pulls files from public github repo instead of copying them from local Github actions folder; configures and makes the software inside a temporary image and then copies the executable to another Alpine based image. Presentation Submit a link to github repo and a string to pull your docker image from docker hub through this form . Assessment 8 points maximum 
    Read more

    PA#1

    Image
    Requirements Create a bash script named dbtime that outputs system time. Make sure only a user database can run this script. Create a bash script named kname that outputs the name of the linux kernel. Make sure only a user serviceK can run this script. Both users database and serviceK are members of a group named dserver . Every member of dserver group can edit scripts dbtime and kname , while other users of the system can only view their contents. Demonstrate this setup in action. Presentation Make a 2 minute video presenting your setup in action and fill-in the link to your presentation in this form . Assessment 8 points maximum.
    Read more